diff --git a/Makefile b/Makefile
index 6b32af10d..63b950685 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,8 @@ install: all
 	mkdir -p  $(INSTALL_SAMPLESDIR) && \
 		 mkdir -p  $(INSTALL_SAMPLESDIR)/simple &&\
 	 	 mkdir -p  $(INSTALL_SAMPLESDIR)/advanced && \
-		(cd examples; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/simple ) && \
-		(cd tests; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/advanced )
+		(cd samples/simple; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/simple ) && \
+		(cd samples/advanced; /bin/cp -fr pdegen fileread $(INSTALL_SAMPLESDIR)/advanced )
 cleanlib:
 	(cd lib; /bin/rm -f *.a *$(.mod) *$(.fh))
 	(cd include; /bin/rm -f *.a *$(.mod) *$(.fh))
@@ -42,13 +42,13 @@ cleanlib:
 
 veryclean: cleanlib
 	(cd amgprec; make veryclean)
-	(cd examples/fileread; make clean)
-	(cd examples/pdegen; make clean)
-	(cd tests/fileread; make clean)
-	(cd tests/pdegen; make clean)
+	(cd samples/simple/fileread; make clean)
+	(cd samples/simple/pdegen; make clean)
+	(cd samples/advanced/fileread; make clean)
+	(cd samples/advanced/pdegen; make clean)
 
 check: all
-	make check -C tests/pdegen
+	make check -C samples/advanced/pdegen
 
 clean:
 	(cd amgprec; make clean)
diff --git a/tests/fileread/Makefile b/samples/advanced/fileread/Makefile
similarity index 98%
rename from tests/fileread/Makefile
rename to samples/advanced/fileread/Makefile
index 187101aa8..d012036a7 100644
--- a/tests/fileread/Makefile
+++ b/samples/advanced/fileread/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
diff --git a/tests/fileread/amg_cf_sample.f90 b/samples/advanced/fileread/amg_cf_sample.f90
similarity index 100%
rename from tests/fileread/amg_cf_sample.f90
rename to samples/advanced/fileread/amg_cf_sample.f90
diff --git a/tests/fileread/amg_df_sample.f90 b/samples/advanced/fileread/amg_df_sample.f90
similarity index 100%
rename from tests/fileread/amg_df_sample.f90
rename to samples/advanced/fileread/amg_df_sample.f90
diff --git a/tests/fileread/amg_sf_sample.f90 b/samples/advanced/fileread/amg_sf_sample.f90
similarity index 100%
rename from tests/fileread/amg_sf_sample.f90
rename to samples/advanced/fileread/amg_sf_sample.f90
diff --git a/tests/fileread/amg_zf_sample.f90 b/samples/advanced/fileread/amg_zf_sample.f90
similarity index 100%
rename from tests/fileread/amg_zf_sample.f90
rename to samples/advanced/fileread/amg_zf_sample.f90
diff --git a/tests/fileread/data_input.f90 b/samples/advanced/fileread/data_input.f90
similarity index 100%
rename from tests/fileread/data_input.f90
rename to samples/advanced/fileread/data_input.f90
diff --git a/tests/fileread/runs/amg_cfs.inp b/samples/advanced/fileread/runs/amg_cfs.inp
similarity index 100%
rename from tests/fileread/runs/amg_cfs.inp
rename to samples/advanced/fileread/runs/amg_cfs.inp
diff --git a/tests/fileread/runs/amg_dfs.inp b/samples/advanced/fileread/runs/amg_dfs.inp
similarity index 100%
rename from tests/fileread/runs/amg_dfs.inp
rename to samples/advanced/fileread/runs/amg_dfs.inp
diff --git a/tests/fileread/runs/amg_mat.mtx b/samples/advanced/fileread/runs/amg_mat.mtx
similarity index 100%
rename from tests/fileread/runs/amg_mat.mtx
rename to samples/advanced/fileread/runs/amg_mat.mtx
diff --git a/tests/fileread/runs/amg_rhs.mtx b/samples/advanced/fileread/runs/amg_rhs.mtx
similarity index 100%
rename from tests/fileread/runs/amg_rhs.mtx
rename to samples/advanced/fileread/runs/amg_rhs.mtx
diff --git a/tests/fileread/runs/amg_sfs.inp b/samples/advanced/fileread/runs/amg_sfs.inp
similarity index 100%
rename from tests/fileread/runs/amg_sfs.inp
rename to samples/advanced/fileread/runs/amg_sfs.inp
diff --git a/tests/fileread/runs/amg_sol.mtx b/samples/advanced/fileread/runs/amg_sol.mtx
similarity index 100%
rename from tests/fileread/runs/amg_sol.mtx
rename to samples/advanced/fileread/runs/amg_sol.mtx
diff --git a/tests/fileread/runs/amg_zfs.inp b/samples/advanced/fileread/runs/amg_zfs.inp
similarity index 100%
rename from tests/fileread/runs/amg_zfs.inp
rename to samples/advanced/fileread/runs/amg_zfs.inp
diff --git a/tests/pdegen/Makefile b/samples/advanced/pdegen/Makefile
similarity index 99%
rename from tests/pdegen/Makefile
rename to samples/advanced/pdegen/Makefile
index 5e12f7750..79c2d89e7 100644
--- a/tests/pdegen/Makefile
+++ b/samples/advanced/pdegen/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
diff --git a/tests/pdegen/amg_d_genpde_mod.F90 b/samples/advanced/pdegen/amg_d_genpde_mod.F90
similarity index 100%
rename from tests/pdegen/amg_d_genpde_mod.F90
rename to samples/advanced/pdegen/amg_d_genpde_mod.F90
diff --git a/tests/pdegen/amg_d_pde2d.f90 b/samples/advanced/pdegen/amg_d_pde2d.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde2d.f90
rename to samples/advanced/pdegen/amg_d_pde2d.f90
diff --git a/tests/pdegen/amg_d_pde2d_base_mod.f90 b/samples/advanced/pdegen/amg_d_pde2d_base_mod.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde2d_base_mod.f90
rename to samples/advanced/pdegen/amg_d_pde2d_base_mod.f90
diff --git a/tests/pdegen/amg_d_pde2d_box_mod.f90 b/samples/advanced/pdegen/amg_d_pde2d_box_mod.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde2d_box_mod.f90
rename to samples/advanced/pdegen/amg_d_pde2d_box_mod.f90
diff --git a/tests/pdegen/amg_d_pde2d_exp_mod.f90 b/samples/advanced/pdegen/amg_d_pde2d_exp_mod.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde2d_exp_mod.f90
rename to samples/advanced/pdegen/amg_d_pde2d_exp_mod.f90
diff --git a/tests/pdegen/amg_d_pde3d.f90 b/samples/advanced/pdegen/amg_d_pde3d.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde3d.f90
rename to samples/advanced/pdegen/amg_d_pde3d.f90
diff --git a/tests/pdegen/amg_d_pde3d_base_mod.f90 b/samples/advanced/pdegen/amg_d_pde3d_base_mod.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde3d_base_mod.f90
rename to samples/advanced/pdegen/amg_d_pde3d_base_mod.f90
diff --git a/tests/pdegen/amg_d_pde3d_exp_mod.f90 b/samples/advanced/pdegen/amg_d_pde3d_exp_mod.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde3d_exp_mod.f90
rename to samples/advanced/pdegen/amg_d_pde3d_exp_mod.f90
diff --git a/tests/pdegen/amg_d_pde3d_gauss_mod.f90 b/samples/advanced/pdegen/amg_d_pde3d_gauss_mod.f90
similarity index 100%
rename from tests/pdegen/amg_d_pde3d_gauss_mod.f90
rename to samples/advanced/pdegen/amg_d_pde3d_gauss_mod.f90
diff --git a/tests/pdegen/amg_s_genpde_mod.F90 b/samples/advanced/pdegen/amg_s_genpde_mod.F90
similarity index 100%
rename from tests/pdegen/amg_s_genpde_mod.F90
rename to samples/advanced/pdegen/amg_s_genpde_mod.F90
diff --git a/tests/pdegen/amg_s_pde2d.f90 b/samples/advanced/pdegen/amg_s_pde2d.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde2d.f90
rename to samples/advanced/pdegen/amg_s_pde2d.f90
diff --git a/tests/pdegen/amg_s_pde2d_base_mod.f90 b/samples/advanced/pdegen/amg_s_pde2d_base_mod.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde2d_base_mod.f90
rename to samples/advanced/pdegen/amg_s_pde2d_base_mod.f90
diff --git a/tests/pdegen/amg_s_pde2d_box_mod.f90 b/samples/advanced/pdegen/amg_s_pde2d_box_mod.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde2d_box_mod.f90
rename to samples/advanced/pdegen/amg_s_pde2d_box_mod.f90
diff --git a/tests/pdegen/amg_s_pde2d_exp_mod.f90 b/samples/advanced/pdegen/amg_s_pde2d_exp_mod.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde2d_exp_mod.f90
rename to samples/advanced/pdegen/amg_s_pde2d_exp_mod.f90
diff --git a/tests/pdegen/amg_s_pde3d.f90 b/samples/advanced/pdegen/amg_s_pde3d.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde3d.f90
rename to samples/advanced/pdegen/amg_s_pde3d.f90
diff --git a/tests/pdegen/amg_s_pde3d_base_mod.f90 b/samples/advanced/pdegen/amg_s_pde3d_base_mod.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde3d_base_mod.f90
rename to samples/advanced/pdegen/amg_s_pde3d_base_mod.f90
diff --git a/tests/pdegen/amg_s_pde3d_exp_mod.f90 b/samples/advanced/pdegen/amg_s_pde3d_exp_mod.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde3d_exp_mod.f90
rename to samples/advanced/pdegen/amg_s_pde3d_exp_mod.f90
diff --git a/tests/pdegen/amg_s_pde3d_gauss_mod.f90 b/samples/advanced/pdegen/amg_s_pde3d_gauss_mod.f90
similarity index 100%
rename from tests/pdegen/amg_s_pde3d_gauss_mod.f90
rename to samples/advanced/pdegen/amg_s_pde3d_gauss_mod.f90
diff --git a/tests/pdegen/data_input.f90 b/samples/advanced/pdegen/data_input.f90
similarity index 100%
rename from tests/pdegen/data_input.f90
rename to samples/advanced/pdegen/data_input.f90
diff --git a/tests/pdegen/runs/amg_pde2d.inp b/samples/advanced/pdegen/runs/amg_pde2d.inp
similarity index 100%
rename from tests/pdegen/runs/amg_pde2d.inp
rename to samples/advanced/pdegen/runs/amg_pde2d.inp
diff --git a/tests/pdegen/runs/amg_pde3d.inp b/samples/advanced/pdegen/runs/amg_pde3d.inp
similarity index 100%
rename from tests/pdegen/runs/amg_pde3d.inp
rename to samples/advanced/pdegen/runs/amg_pde3d.inp
diff --git a/examples/fileread/Makefile b/samples/simple/fileread/Makefile
similarity index 99%
rename from examples/fileread/Makefile
rename to samples/simple/fileread/Makefile
index 2375b30fd..6f36ed043 100644
--- a/examples/fileread/Makefile
+++ b/samples/simple/fileread/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
diff --git a/examples/fileread/amg_cexample_1lev.f90 b/samples/simple/fileread/amg_cexample_1lev.f90
similarity index 100%
rename from examples/fileread/amg_cexample_1lev.f90
rename to samples/simple/fileread/amg_cexample_1lev.f90
diff --git a/examples/fileread/amg_cexample_ml.f90 b/samples/simple/fileread/amg_cexample_ml.f90
similarity index 100%
rename from examples/fileread/amg_cexample_ml.f90
rename to samples/simple/fileread/amg_cexample_ml.f90
diff --git a/examples/fileread/amg_dexample_1lev.f90 b/samples/simple/fileread/amg_dexample_1lev.f90
similarity index 100%
rename from examples/fileread/amg_dexample_1lev.f90
rename to samples/simple/fileread/amg_dexample_1lev.f90
diff --git a/examples/fileread/amg_dexample_ml.f90 b/samples/simple/fileread/amg_dexample_ml.f90
similarity index 100%
rename from examples/fileread/amg_dexample_ml.f90
rename to samples/simple/fileread/amg_dexample_ml.f90
diff --git a/examples/fileread/amg_sexample_1lev.f90 b/samples/simple/fileread/amg_sexample_1lev.f90
similarity index 100%
rename from examples/fileread/amg_sexample_1lev.f90
rename to samples/simple/fileread/amg_sexample_1lev.f90
diff --git a/examples/fileread/amg_sexample_ml.f90 b/samples/simple/fileread/amg_sexample_ml.f90
similarity index 100%
rename from examples/fileread/amg_sexample_ml.f90
rename to samples/simple/fileread/amg_sexample_ml.f90
diff --git a/examples/fileread/amg_zexample_1lev.f90 b/samples/simple/fileread/amg_zexample_1lev.f90
similarity index 100%
rename from examples/fileread/amg_zexample_1lev.f90
rename to samples/simple/fileread/amg_zexample_1lev.f90
diff --git a/examples/fileread/amg_zexample_ml.f90 b/samples/simple/fileread/amg_zexample_ml.f90
similarity index 100%
rename from examples/fileread/amg_zexample_ml.f90
rename to samples/simple/fileread/amg_zexample_ml.f90
diff --git a/examples/fileread/data_input.f90 b/samples/simple/fileread/data_input.f90
similarity index 100%
rename from examples/fileread/data_input.f90
rename to samples/simple/fileread/data_input.f90
diff --git a/examples/fileread/runs/1lev.inp b/samples/simple/fileread/runs/1lev.inp
similarity index 100%
rename from examples/fileread/runs/1lev.inp
rename to samples/simple/fileread/runs/1lev.inp
diff --git a/examples/fileread/runs/ml.inp b/samples/simple/fileread/runs/ml.inp
similarity index 100%
rename from examples/fileread/runs/ml.inp
rename to samples/simple/fileread/runs/ml.inp
diff --git a/examples/fileread/runs/mld_mat.mtx b/samples/simple/fileread/runs/mld_mat.mtx
similarity index 100%
rename from examples/fileread/runs/mld_mat.mtx
rename to samples/simple/fileread/runs/mld_mat.mtx
diff --git a/examples/fileread/runs/mld_rhs.mtx b/samples/simple/fileread/runs/mld_rhs.mtx
similarity index 100%
rename from examples/fileread/runs/mld_rhs.mtx
rename to samples/simple/fileread/runs/mld_rhs.mtx
diff --git a/examples/fileread/runs/mld_sol.mtx b/samples/simple/fileread/runs/mld_sol.mtx
similarity index 100%
rename from examples/fileread/runs/mld_sol.mtx
rename to samples/simple/fileread/runs/mld_sol.mtx
diff --git a/examples/pdegen/Makefile b/samples/simple/pdegen/Makefile
similarity index 99%
rename from examples/pdegen/Makefile
rename to samples/simple/pdegen/Makefile
index 7a03d5b9d..198654d5a 100644
--- a/examples/pdegen/Makefile
+++ b/samples/simple/pdegen/Makefile
@@ -1,4 +1,4 @@
-AMGDIR=../..
+AMGDIR=../../..
 AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
diff --git a/examples/pdegen/amg_dexample_1lev.f90 b/samples/simple/pdegen/amg_dexample_1lev.f90
similarity index 100%
rename from examples/pdegen/amg_dexample_1lev.f90
rename to samples/simple/pdegen/amg_dexample_1lev.f90
diff --git a/examples/pdegen/amg_dexample_ml.f90 b/samples/simple/pdegen/amg_dexample_ml.f90
similarity index 100%
rename from examples/pdegen/amg_dexample_ml.f90
rename to samples/simple/pdegen/amg_dexample_ml.f90
diff --git a/examples/pdegen/amg_dpde_mod.f90 b/samples/simple/pdegen/amg_dpde_mod.f90
similarity index 100%
rename from examples/pdegen/amg_dpde_mod.f90
rename to samples/simple/pdegen/amg_dpde_mod.f90
diff --git a/examples/pdegen/amg_sexample_1lev.f90 b/samples/simple/pdegen/amg_sexample_1lev.f90
similarity index 100%
rename from examples/pdegen/amg_sexample_1lev.f90
rename to samples/simple/pdegen/amg_sexample_1lev.f90
diff --git a/examples/pdegen/amg_sexample_ml.f90 b/samples/simple/pdegen/amg_sexample_ml.f90
similarity index 100%
rename from examples/pdegen/amg_sexample_ml.f90
rename to samples/simple/pdegen/amg_sexample_ml.f90
diff --git a/examples/pdegen/amg_spde_mod.f90 b/samples/simple/pdegen/amg_spde_mod.f90
similarity index 100%
rename from examples/pdegen/amg_spde_mod.f90
rename to samples/simple/pdegen/amg_spde_mod.f90
diff --git a/examples/pdegen/data_input.f90 b/samples/simple/pdegen/data_input.f90
similarity index 100%
rename from examples/pdegen/data_input.f90
rename to samples/simple/pdegen/data_input.f90
diff --git a/examples/pdegen/runs/1lev.inp b/samples/simple/pdegen/runs/1lev.inp
similarity index 100%
rename from examples/pdegen/runs/1lev.inp
rename to samples/simple/pdegen/runs/1lev.inp
diff --git a/examples/pdegen/runs/ml.inp b/samples/simple/pdegen/runs/ml.inp
similarity index 100%
rename from examples/pdegen/runs/ml.inp
rename to samples/simple/pdegen/runs/ml.inp
diff --git a/examples/pdegen/runs/script.pbs b/samples/simple/pdegen/runs/script.pbs
similarity index 100%
rename from examples/pdegen/runs/script.pbs
rename to samples/simple/pdegen/runs/script.pbs
diff --git a/examples/pdegen/runs/script1lev.pbs b/samples/simple/pdegen/runs/script1lev.pbs
similarity index 100%
rename from examples/pdegen/runs/script1lev.pbs
rename to samples/simple/pdegen/runs/script1lev.pbs