diff --git a/lib/Grid_init.cc b/lib/Grid_init.cc
old mode 100755
new mode 100644
diff --git a/lib/Makefile.am b/lib/Makefile.am
index dab5c6d3..20c1f867 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,12 +3,12 @@ AM_CXXFLAGS = -I$(top_srcdir)/
 
 extra_sources=
 if BUILD_COMMS_MPI
-  extra_sources+=Grid_communicator_mpi.cc
-  extra_sources+=Grid_stencil_common.cc
+  extra_sources+=communicator/Grid_communicator_mpi.cc
+  extra_sources+=stencil/Grid_stencil_common.cc
 endif
 if BUILD_COMMS_NONE
-  extra_sources+=Grid_communicator_fake.cc
-  extra_sources+=Grid_stencil_common.cc
+  extra_sources+=communicator/Grid_communicator_fake.cc
+  extra_sources+=stencil/Grid_stencil_common.cc
 endif
 
 #
@@ -22,55 +22,56 @@ libGrid_a_SOURCES = Grid_init.cc $(extra_sources)
 #
 include_HEADERS =\
 	Grid.h\
-	Grid_QCD.h\
 	Grid_aligned_allocator.h\
 	Grid_cartesian.h\
-	Grid_cartesian_base.h\
-	Grid_cartesian_full.h\
-	Grid_cartesian_red_black.h\
 	Grid_communicator.h\
 	Grid_comparison.h\
 	Grid_config.h\
 	Grid_cshift.h\
-	Grid_cshift_common.h\
-	Grid_cshift_mpi.h\
-	Grid_cshift_none.h\
 	Grid_lattice.h\
-	Grid_lattice_arith.h\
-	Grid_lattice_conformable.h\
-	Grid_lattice_coordinate.h\
-	Grid_lattice_local.h\
-	Grid_lattice_peekpoke.h\
-	Grid_lattice_reality.h\
-	Grid_lattice_reduction.h
-	Grid_lattice_rng.h\
-	Grid_lattice_trace.h\
-	Grid_lattice_transfer.h\
-	Grid_lattice_transpose.h\
 	Grid_math.h\
-	Grid_math_arith.h\
-	Grid_math_arith_add.h\
-	Grid_math_arith_mac.h\
-	Grid_math_arith_mul.h\
-	Grid_math_arith_scalar.h\
-	Grid_math_arith_sub.h\
-	Grid_math_inner.h\
-	Grid_math_outer.h\
-	Grid_math_peek.h\
-	Grid_math_poke.h\
-	Grid_math_reality.h\
-	Grid_math_tensors.h\
-	Grid_math_trace.h\
-	Grid_math_traits.h\
-	Grid_math_transpose.h\
 	Grid_simd.h\
 	Grid_stencil.h\
 	Grid_summation.h\
-	Grid_vComplexD.h\
-	Grid_vComplexF.h\
-	Grid_vInteger.h\
-	Grid_vRealD.h\
-	Grid_vRealF.h\
 	Grid_where.h
 
+nobase_include_HEADERS=\
+	cartesian/Grid_cartesian_base.h\
+	cartesian/Grid_cartesian_full.h\
+	cartesian/Grid_cartesian_red_black.h\
+	cshift/Grid_cshift_common.h\
+	cshift/Grid_cshift_mpi.h\
+	cshift/Grid_cshift_none.h\
+	lattice/Grid_lattice_arith.h\
+	lattice/Grid_lattice_conformable.h\
+	lattice/Grid_lattice_coordinate.h\
+	lattice/Grid_lattice_local.h\
+	lattice/Grid_lattice_peekpoke.h\
+	lattice/Grid_lattice_reality.h\
+	lattice/Grid_lattice_reduction.h\
+	lattice/Grid_lattice_rng.h\
+	lattice/Grid_lattice_trace.h\
+	lattice/Grid_lattice_transfer.h\
+	lattice/Grid_lattice_transpose.h\
+	math/Grid_math_arith.h\
+	math/Grid_math_arith_add.h\
+	math/Grid_math_arith_mac.h\
+	math/Grid_math_arith_mul.h\
+	math/Grid_math_arith_scalar.h\
+	math/Grid_math_arith_sub.h\
+	math/Grid_math_inner.h\
+	math/Grid_math_outer.h\
+	math/Grid_math_peek.h\
+	math/Grid_math_poke.h\
+	math/Grid_math_reality.h\
+	math/Grid_math_tensors.h\
+	math/Grid_math_trace.h\
+	math/Grid_math_traits.h\
+	math/Grid_math_transpose.h\
+	qcd/Grid_QCD.h\
+	simd/Grid_vComplexD.h\
+	simd/Grid_vComplexF.h\
+	simd/Grid_vInteger.h\
+	simd/Grid_vRealD.h\
+	simd/Grid_vRealF.h
 
diff --git a/tests/Grid_main.cc b/tests/Grid_main.cc
index e58d20e2..bd206ea1 100644
--- a/tests/Grid_main.cc
+++ b/tests/Grid_main.cc
@@ -277,7 +277,7 @@ int main (int argc, char ** argv)
         peekSite(bar,Bar,coor);
         for(int r=0;r<3;r++){
         for(int c=0;c<3;c++){
-	  //	  cout<<"bar "<<coor[0]<<coor[1]<<coor[2]<<coor[3] <<" "<<bar._internal._internal[r][c]<<std::endl;
+	  cout<<"bar "<<coor[0]<<coor[1]<<coor[2]<<coor[3] <<" "<<bar()()(r,c)<<std::endl;
 	}}
       }}}}
     }