diff --git a/drivers/iohb.c b/src/drivers/iohb.c
similarity index 100%
rename from drivers/iohb.c
rename to src/drivers/iohb.c
diff --git a/drivers/iohb.h b/src/drivers/iohb.h
similarity index 100%
rename from drivers/iohb.h
rename to src/drivers/iohb.h
diff --git a/drivers/laplacian.c b/src/drivers/laplacian.c
similarity index 100%
rename from drivers/laplacian.c
rename to src/drivers/laplacian.c
diff --git a/drivers/laplacian.h b/src/drivers/laplacian.h
similarity index 100%
rename from drivers/laplacian.h
rename to src/drivers/laplacian.h
diff --git a/drivers/mmio.c b/src/drivers/mmio.c
similarity index 100%
rename from drivers/mmio.c
rename to src/drivers/mmio.c
diff --git a/drivers/mmio.h b/src/drivers/mmio.h
similarity index 100%
rename from drivers/mmio.h
rename to src/drivers/mmio.h
diff --git a/drivers/readhb.c b/src/drivers/readhb.c
similarity index 100%
rename from drivers/readhb.c
rename to src/drivers/readhb.c
diff --git a/drivers/readijv.c b/src/drivers/readijv.c
similarity index 100%
rename from drivers/readijv.c
rename to src/drivers/readijv.c
diff --git a/drivers/readmm.c b/src/drivers/readmm.c
similarity index 100%
rename from drivers/readmm.c
rename to src/drivers/readmm.c
diff --git a/drivers/readrsa.c b/src/drivers/readrsa.c
similarity index 100%
rename from drivers/readrsa.c
rename to src/drivers/readrsa.c
diff --git a/drivers/skitf.f b/src/drivers/skitf.f
similarity index 100%
rename from drivers/skitf.f
rename to src/drivers/skitf.f
diff --git a/integer_sort.c b/src/integer_sort.c
similarity index 100%
rename from integer_sort.c
rename to src/integer_sort.c
diff --git a/integer_sort_mtypes.c b/src/integer_sort_mtypes.c
similarity index 100%
rename from integer_sort_mtypes.c
rename to src/integer_sort_mtypes.c
diff --git a/spm.c b/src/spm.c
similarity index 100%
rename from spm.c
rename to src/spm.c
diff --git a/spm.h b/src/spm.h
similarity index 100%
rename from spm.h
rename to src/spm.h
diff --git a/spm_dof_extend.c b/src/spm_dof_extend.c
similarity index 100%
rename from spm_dof_extend.c
rename to src/spm_dof_extend.c
diff --git a/spm_drivers.h b/src/spm_drivers.h
similarity index 100%
rename from spm_drivers.h
rename to src/spm_drivers.h
diff --git a/spm_gen_fake_values.c b/src/spm_gen_fake_values.c
similarity index 100%
rename from spm_gen_fake_values.c
rename to src/spm_gen_fake_values.c
diff --git a/spm_integers.c b/src/spm_integers.c
similarity index 100%
rename from spm_integers.c
rename to src/spm_integers.c
diff --git a/spm_io.c b/src/spm_io.c
similarity index 100%
rename from spm_io.c
rename to src/spm_io.c
diff --git a/spm_read_driver.c b/src/spm_read_driver.c
similarity index 100%
rename from spm_read_driver.c
rename to src/spm_read_driver.c
diff --git a/z_spm.c b/src/z_spm.c
similarity index 100%
rename from z_spm.c
rename to src/z_spm.c
diff --git a/z_spm.h b/src/z_spm.h
similarity index 100%
rename from z_spm.h
rename to src/z_spm.h
diff --git a/z_spm_2dense.c b/src/z_spm_2dense.c
similarity index 100%
rename from z_spm_2dense.c
rename to src/z_spm_2dense.c
diff --git a/z_spm_convert_to_csc.c b/src/z_spm_convert_to_csc.c
similarity index 100%
rename from z_spm_convert_to_csc.c
rename to src/z_spm_convert_to_csc.c
diff --git a/z_spm_convert_to_csr.c b/src/z_spm_convert_to_csr.c
similarity index 100%
rename from z_spm_convert_to_csr.c
rename to src/z_spm_convert_to_csr.c
diff --git a/z_spm_convert_to_ijv.c b/src/z_spm_convert_to_ijv.c
similarity index 100%
rename from z_spm_convert_to_ijv.c
rename to src/z_spm_convert_to_ijv.c
diff --git a/z_spm_dof_extend.c b/src/z_spm_dof_extend.c
similarity index 100%
rename from z_spm_dof_extend.c
rename to src/z_spm_dof_extend.c
diff --git a/z_spm_expand.c b/src/z_spm_expand.c
similarity index 100%
rename from z_spm_expand.c
rename to src/z_spm_expand.c
diff --git a/z_spm_genrhs.c b/src/z_spm_genrhs.c
similarity index 100%
rename from z_spm_genrhs.c
rename to src/z_spm_genrhs.c
diff --git a/z_spm_integer.c b/src/z_spm_integer.c
similarity index 100%
rename from z_spm_integer.c
rename to src/z_spm_integer.c
diff --git a/z_spm_laplacian.c b/src/z_spm_laplacian.c
similarity index 100%
rename from z_spm_laplacian.c
rename to src/z_spm_laplacian.c
diff --git a/z_spm_matrixvector.c b/src/z_spm_matrixvector.c
similarity index 100%
rename from z_spm_matrixvector.c
rename to src/z_spm_matrixvector.c
diff --git a/z_spm_norm.c b/src/z_spm_norm.c
similarity index 100%
rename from z_spm_norm.c
rename to src/z_spm_norm.c
diff --git a/z_spm_print.c b/src/z_spm_print.c
similarity index 100%
rename from z_spm_print.c
rename to src/z_spm_print.c
diff --git a/z_spm_scal.c b/src/z_spm_scal.c
similarity index 100%
rename from z_spm_scal.c
rename to src/z_spm_scal.c