diff --git a/.travis.yml b/.travis.yml
index dd28c132..10b19f7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ addons:
 cache:
   directories:
   - $HOME/.opam/
+  - $HOME/lapack-release
 
 language: python
 python:
diff --git a/install/scripts/install_lapack.sh b/install/scripts/install_lapack.sh
index 25cbefc6..e23a14d8 100755
--- a/install/scripts/install_lapack.sh
+++ b/install/scripts/install_lapack.sh
@@ -1,6 +1,10 @@
 #!/bin/bash -x
 
-git clone https://github.com/Reference-LAPACK/lapack-release.git
+if [[ ! -d lapack-release ]]
+then
+  git clone https://github.com/Reference-LAPACK/lapack-release.git
+fi
+
 cd lapack-release
 cp make.inc.example make.inc
 make -j 8 
diff --git a/plugins/DavidsonDressed/README.rst b/src/DavidsonDressed/README.rst
similarity index 100%
rename from plugins/DavidsonDressed/README.rst
rename to src/DavidsonDressed/README.rst
diff --git a/plugins/DavidsonDressed/diagonalization_hs2_dressed.irp.f b/src/DavidsonDressed/diagonalization_hs2_dressed.irp.f
similarity index 100%
rename from plugins/DavidsonDressed/diagonalization_hs2_dressed.irp.f
rename to src/DavidsonDressed/diagonalization_hs2_dressed.irp.f
diff --git a/plugins/DavidsonUndressed/NEEDED_CHILDREN_MODULES b/src/DavidsonUndressed/NEEDED_CHILDREN_MODULES
similarity index 100%
rename from plugins/DavidsonUndressed/NEEDED_CHILDREN_MODULES
rename to src/DavidsonUndressed/NEEDED_CHILDREN_MODULES
diff --git a/plugins/DavidsonUndressed/README.rst b/src/DavidsonUndressed/README.rst
similarity index 100%
rename from plugins/DavidsonUndressed/README.rst
rename to src/DavidsonUndressed/README.rst
diff --git a/plugins/DavidsonUndressed/davidson_slave.irp.f b/src/DavidsonUndressed/davidson_slave.irp.f
similarity index 100%
rename from plugins/DavidsonUndressed/davidson_slave.irp.f
rename to src/DavidsonUndressed/davidson_slave.irp.f
diff --git a/plugins/DavidsonUndressed/diag_restart_save_all_states.irp.f b/src/DavidsonUndressed/diag_restart_save_all_states.irp.f
similarity index 100%
rename from plugins/DavidsonUndressed/diag_restart_save_all_states.irp.f
rename to src/DavidsonUndressed/diag_restart_save_all_states.irp.f
diff --git a/plugins/DavidsonUndressed/diag_restart_save_lowest_state.irp.f b/src/DavidsonUndressed/diag_restart_save_lowest_state.irp.f
similarity index 100%
rename from plugins/DavidsonUndressed/diag_restart_save_lowest_state.irp.f
rename to src/DavidsonUndressed/diag_restart_save_lowest_state.irp.f
diff --git a/plugins/DavidsonUndressed/diag_restart_save_one_state.irp.f b/src/DavidsonUndressed/diag_restart_save_one_state.irp.f
similarity index 100%
rename from plugins/DavidsonUndressed/diag_restart_save_one_state.irp.f
rename to src/DavidsonUndressed/diag_restart_save_one_state.irp.f
diff --git a/plugins/DavidsonUndressed/guess_lowest_state.irp.f b/src/DavidsonUndressed/guess_lowest_state.irp.f
similarity index 100%
rename from plugins/DavidsonUndressed/guess_lowest_state.irp.f
rename to src/DavidsonUndressed/guess_lowest_state.irp.f
diff --git a/plugins/DavidsonUndressed/print_H_matrix_restart.irp.f b/src/DavidsonUndressed/print_H_matrix_restart.irp.f
similarity index 100%
rename from plugins/DavidsonUndressed/print_H_matrix_restart.irp.f
rename to src/DavidsonUndressed/print_H_matrix_restart.irp.f
diff --git a/plugins/DavidsonUndressed/print_energy.irp.f b/src/DavidsonUndressed/print_energy.irp.f
similarity index 100%
rename from plugins/DavidsonUndressed/print_energy.irp.f
rename to src/DavidsonUndressed/print_energy.irp.f