diff --git a/build/make.default b/build/make.default
index f663694..144ac77 100644
--- a/build/make.default
+++ b/build/make.default
@@ -39,4 +39,4 @@ NDIMS        = 2
 #
 # path for temporary files during compilation (uncomment if you wish to use it)
 #
-#OBJSDIR := /tmp/${USER}/amun-code/obj
\ No newline at end of file
+#OBJSDIR := /tmp/${USER}/amun-code/objects
\ No newline at end of file
diff --git a/build/makefile b/build/makefile
index 0f6f0ff..d9915c5 100644
--- a/build/makefile
+++ b/build/makefile
@@ -3,8 +3,8 @@
 # directories indicating where the source files are, where the object files
 # should be created and where to save the resulting executable file
 
-SRCSDIR := ../src
-OBJSDIR := ./obj
+SRCSDIR := ../sources
+OBJSDIR := ./objects
 DESTDIR := .
 
 #-------------------------------------------------------------------------------
diff --git a/build/mkdeps.sh b/build/mkdeps.sh
index 11239a5..ffee0bd 100755
--- a/build/mkdeps.sh
+++ b/build/mkdeps.sh
@@ -8,7 +8,7 @@
 #
 # Example:
 #
-#   mkdep.sh ../src ./obj
+#   mkdep.sh ../sources ./objects
 #
 # Requirements: awk, sort, uniq
 #
diff --git a/src/algebra.F90 b/sources/algebra.F90
similarity index 100%
rename from src/algebra.F90
rename to sources/algebra.F90
diff --git a/src/blocks.F90 b/sources/blocks.F90
similarity index 100%
rename from src/blocks.F90
rename to sources/blocks.F90
diff --git a/src/boundaries.F90 b/sources/boundaries.F90
similarity index 100%
rename from src/boundaries.F90
rename to sources/boundaries.F90
diff --git a/src/constants.F90 b/sources/constants.F90
similarity index 100%
rename from src/constants.F90
rename to sources/constants.F90
diff --git a/src/coordinates.F90 b/sources/coordinates.F90
similarity index 100%
rename from src/coordinates.F90
rename to sources/coordinates.F90
diff --git a/src/domains.F90 b/sources/domains.F90
similarity index 100%
rename from src/domains.F90
rename to sources/domains.F90
diff --git a/src/driver.F90 b/sources/driver.F90
similarity index 100%
rename from src/driver.F90
rename to sources/driver.F90
diff --git a/src/equations.F90 b/sources/equations.F90
similarity index 100%
rename from src/equations.F90
rename to sources/equations.F90
diff --git a/src/evolution.F90 b/sources/evolution.F90
similarity index 100%
rename from src/evolution.F90
rename to sources/evolution.F90
diff --git a/src/gravity.F90 b/sources/gravity.F90
similarity index 100%
rename from src/gravity.F90
rename to sources/gravity.F90
diff --git a/src/integrals.F90 b/sources/integrals.F90
similarity index 100%
rename from src/integrals.F90
rename to sources/integrals.F90
diff --git a/src/interpolations.F90 b/sources/interpolations.F90
similarity index 100%
rename from src/interpolations.F90
rename to sources/interpolations.F90
diff --git a/src/io.F90 b/sources/io.F90
similarity index 100%
rename from src/io.F90
rename to sources/io.F90
diff --git a/src/mesh.F90 b/sources/mesh.F90
similarity index 100%
rename from src/mesh.F90
rename to sources/mesh.F90
diff --git a/src/mpitools.F90 b/sources/mpitools.F90
similarity index 100%
rename from src/mpitools.F90
rename to sources/mpitools.F90
diff --git a/src/operators.F90 b/sources/operators.F90
similarity index 100%
rename from src/operators.F90
rename to sources/operators.F90
diff --git a/src/parameters.F90 b/sources/parameters.F90
similarity index 100%
rename from src/parameters.F90
rename to sources/parameters.F90
diff --git a/src/problems.F90 b/sources/problems.F90
similarity index 100%
rename from src/problems.F90
rename to sources/problems.F90
diff --git a/src/random.F90 b/sources/random.F90
similarity index 100%
rename from src/random.F90
rename to sources/random.F90
diff --git a/src/refinement.F90 b/sources/refinement.F90
similarity index 100%
rename from src/refinement.F90
rename to sources/refinement.F90
diff --git a/src/schemes.F90 b/sources/schemes.F90
similarity index 100%
rename from src/schemes.F90
rename to sources/schemes.F90
diff --git a/src/shapes.F90 b/sources/shapes.F90
similarity index 100%
rename from src/shapes.F90
rename to sources/shapes.F90
diff --git a/src/sources.F90 b/sources/sources.F90
similarity index 100%
rename from src/sources.F90
rename to sources/sources.F90
diff --git a/src/timers.F90 b/sources/timers.F90
similarity index 100%
rename from src/timers.F90
rename to sources/timers.F90
diff --git a/src/user_problem.F90 b/sources/user_problem.F90
similarity index 100%
rename from src/user_problem.F90
rename to sources/user_problem.F90