diff --git a/src/modules/common/makefile b/src/modules/common/makefile
new file mode 100644
index 0000000..a57871b
--- /dev/null
+++ b/src/modules/common/makefile
@@ -0,0 +1,11 @@
+OBJS = moduleCompTime.o moduleCaseParam.o moduleConstParam.o \
+			 moduleErrors.o moduleMath.o moduleParallel.o \
+			 moduleRandom.o moduleRefParam.o moduleTable.o
+
+all: $(OBJS)
+
+moduleTable.o: moduleErrors.o moduleTable.f90
+	$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
+
+%.o: %.f90
+	$(FC) $(FCFLAGS) -c $< -o $(OBJDIR)/$@
diff --git a/src/modules/moduleCaseParam.f90 b/src/modules/common/moduleCaseParam.f90
similarity index 100%
rename from src/modules/moduleCaseParam.f90
rename to src/modules/common/moduleCaseParam.f90
diff --git a/src/modules/moduleCompTime.f90 b/src/modules/common/moduleCompTime.f90
similarity index 91%
rename from src/modules/moduleCompTime.f90
rename to src/modules/common/moduleCompTime.f90
index d0a6755..46310f0 100644
--- a/src/modules/moduleCompTime.f90
+++ b/src/modules/common/moduleCompTime.f90
@@ -1,5 +1,9 @@
 !Information to calculate computation time
 MODULE moduleCompTime
+  IMPLICIT NONE
+
+  PUBLIC
+
   REAL(8):: tStep    = 0.D0
   REAL(8):: tPush    = 0.D0
   REAL(8):: tReset   = 0.D0
diff --git a/src/modules/moduleConstParam.f90 b/src/modules/common/moduleConstParam.f90
similarity index 100%
rename from src/modules/moduleConstParam.f90
rename to src/modules/common/moduleConstParam.f90
diff --git a/src/modules/moduleErrors.f90 b/src/modules/common/moduleErrors.f90
similarity index 100%
rename from src/modules/moduleErrors.f90
rename to src/modules/common/moduleErrors.f90
diff --git a/src/modules/moduleMath.f90 b/src/modules/common/moduleMath.f90
similarity index 100%
rename from src/modules/moduleMath.f90
rename to src/modules/common/moduleMath.f90
diff --git a/src/modules/moduleParallel.f90 b/src/modules/common/moduleParallel.f90
similarity index 100%
rename from src/modules/moduleParallel.f90
rename to src/modules/common/moduleParallel.f90
diff --git a/src/modules/moduleRandom.f90 b/src/modules/common/moduleRandom.f90
similarity index 100%
rename from src/modules/moduleRandom.f90
rename to src/modules/common/moduleRandom.f90
diff --git a/src/modules/moduleRefParam.f90 b/src/modules/common/moduleRefParam.f90
similarity index 100%
rename from src/modules/moduleRefParam.f90
rename to src/modules/common/moduleRefParam.f90
diff --git a/src/modules/moduleTable.f90 b/src/modules/common/moduleTable.f90
similarity index 100%
rename from src/modules/moduleTable.f90
rename to src/modules/common/moduleTable.f90
diff --git a/src/modules/init/makefile b/src/modules/init/makefile
new file mode 100644
index 0000000..c035f7e
--- /dev/null
+++ b/src/modules/init/makefile
@@ -0,0 +1,5 @@
+all: moduleInput.o
+
+%.o: %.f90
+	$(FC) $(FCFLAGS) -c $< -o $(OBJDIR)/$@
+
diff --git a/src/modules/moduleInput.f90 b/src/modules/init/moduleInput.f90
similarity index 99%
rename from src/modules/moduleInput.f90
rename to src/modules/init/moduleInput.f90
index 348edf3..2523b3b 100644
--- a/src/modules/moduleInput.f90
+++ b/src/modules/init/moduleInput.f90
@@ -9,7 +9,6 @@ MODULE moduleInput
       USE json_module
       USE moduleErrors
       USE moduleBoundary
-      USE moduleInject
       USE moduleOutput
       USE moduleMesh
       IMPLICIT NONE
diff --git a/src/modules/makefile b/src/modules/makefile
index 5b6aa11..254d015 100644
--- a/src/modules/makefile
+++ b/src/modules/makefile
@@ -1,37 +1,40 @@
-
-OBJS = moduleCaseParam.o moduleCompTime.o moduleList.o \
-		   output.o moduleInput.o solver.o \
-			 moduleCollisions.o moduleTable.o moduleParallel.o \
-			 moduleRandom.o moduleMath.o moduleProbe.o
+OBJS = common.o output.o mesh.o solver.o init.o \
+			 moduleBoundary.o moduleCollisions.o moduleInject.o \
+			 moduleList.o moduleProbe.o \
+			 moduleSpecies.o
 
 all: $(OBJS)
 
-output.o: moduleMath.o moduleRefParam.o
+common.o:
+	$(MAKE) -C common all
+
+output.o: moduleSpecies.o common.o
 	$(MAKE) -C output all
 
 mesh.o: moduleCollisions.o moduleBoundary.o output.o
 	$(MAKE) -C mesh all
 
-solver.o: moduleSpecies.o moduleProbe.o moduleRandom.o output.o mesh.o
+solver.o: moduleSpecies.o moduleProbe.o common.o output.o mesh.o
 	$(MAKE) -C solver all
 
-moduleCollisions.o: moduleList.o moduleMath.o moduleRandom.o moduleTable.o moduleSpecies.o moduleRefParam.o moduleConstParam.o moduleCollisions.f90
+init.o: common.o solver.o moduleInject.o
+	$(MAKE) -C init all
+
+moduleBoundary.o: common.o moduleBoundary.f90
 	$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
 
-moduleInput.o: moduleParallel.o solver.o moduleInject.o moduleInput.f90
+moduleCollisions.o: moduleList.o moduleSpecies.o common.o moduleCollisions.f90
 	$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
 
-moduleInject.o: moduleInject.f90
-	$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
-
-moduleList.o: moduleConstParam.o moduleErrors.o moduleCaseParam.o moduleSpecies.o moduleList.f90
+moduleList.o: common.o moduleSpecies.o moduleList.f90
 	$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
 
 moduleProbe.o: mesh.o moduleProbe.f90
 	$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
 
-moduleBoundary.o: moduleTable.o moduleBoundary.f90
+moduleSpecies.o: common.o moduleSpecies.f90
 	$(FC) $(FCFLAGS) -c $(subst .o,.f90,$@) -o $(OBJDIR)/$@
 
 %.o: %.f90
 	$(FC) $(FCFLAGS) -c $< -o $(OBJDIR)/$@
+