diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
deleted file mode 100644
index 00ad3180e6d3af1d6eeb07e6e72076d89d5517bb..0000000000000000000000000000000000000000
--- a/Code/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#=========================================================================
-
-#  Program: Large Scale Generic Region Merging Library (GRM)
-#  Language: C++
-#  author: Lassalle Pierre
-
-
-
-#  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved
-
-#  See grmlib-copyright.txt for details.
-
-#     This software is distributed WITHOUT ANY WARRANTY; without even
-#     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#     PURPOSE.  See the above copyright notices for more information.
-
-#=========================================================================add_library(OTBGRM 
-add_library(OTBLSGRM 
-			lsrmNeighborhood.cpp
-			lpContour.cpp)
-
-target_link_libraries(OTBLSGRM ${OTB_LIBRARIES})
diff --git a/App/CMakeLists.txt b/app/CMakeLists.txt
similarity index 100%
rename from App/CMakeLists.txt
rename to app/CMakeLists.txt
diff --git a/App/otbLSGRM.cxx b/app/otbLSGRM.cxx
similarity index 100%
rename from App/otbLSGRM.cxx
rename to app/otbLSGRM.cxx
diff --git a/Code/lpContour.cpp b/include/lpContour.cpp
similarity index 100%
rename from Code/lpContour.cpp
rename to include/lpContour.cpp
diff --git a/Code/lpContour.h b/include/lpContour.h
similarity index 100%
rename from Code/lpContour.h
rename to include/lpContour.h
diff --git a/Code/lsgrmController.h b/include/lsgrmController.h
similarity index 100%
rename from Code/lsgrmController.h
rename to include/lsgrmController.h
diff --git a/Code/lsgrmController.txx b/include/lsgrmController.txx
similarity index 100%
rename from Code/lsgrmController.txx
rename to include/lsgrmController.txx
diff --git a/Code/lsgrmGraphOperations.h b/include/lsgrmGraphOperations.h
similarity index 100%
rename from Code/lsgrmGraphOperations.h
rename to include/lsgrmGraphOperations.h
diff --git a/Code/lsgrmGraphOperations.txx b/include/lsgrmGraphOperations.txx
similarity index 100%
rename from Code/lsgrmGraphOperations.txx
rename to include/lsgrmGraphOperations.txx
diff --git a/Code/lsgrmHeader.h b/include/lsgrmHeader.h
similarity index 100%
rename from Code/lsgrmHeader.h
rename to include/lsgrmHeader.h
diff --git a/Code/lsgrmSplitter.h b/include/lsgrmSplitter.h
similarity index 100%
rename from Code/lsgrmSplitter.h
rename to include/lsgrmSplitter.h
diff --git a/Code/lsgrmSplitter.txx b/include/lsgrmSplitter.txx
similarity index 100%
rename from Code/lsgrmSplitter.txx
rename to include/lsgrmSplitter.txx
diff --git a/Code/lsrmBaatzSegmenter.h b/include/lsrmBaatzSegmenter.h
similarity index 100%
rename from Code/lsrmBaatzSegmenter.h
rename to include/lsrmBaatzSegmenter.h
diff --git a/Code/lsrmBaatzSegmenter.txx b/include/lsrmBaatzSegmenter.txx
similarity index 100%
rename from Code/lsrmBaatzSegmenter.txx
rename to include/lsrmBaatzSegmenter.txx
diff --git a/Code/lsrmDataStructures.h b/include/lsrmDataStructures.h
similarity index 100%
rename from Code/lsrmDataStructures.h
rename to include/lsrmDataStructures.h
diff --git a/Code/lsrmGetInternalMemory.h b/include/lsrmGetInternalMemory.h
similarity index 100%
rename from Code/lsrmGetInternalMemory.h
rename to include/lsrmGetInternalMemory.h
diff --git a/Code/lsrmGraph.h b/include/lsrmGraph.h
similarity index 100%
rename from Code/lsrmGraph.h
rename to include/lsrmGraph.h
diff --git a/Code/lsrmGraphOperations.h b/include/lsrmGraphOperations.h
similarity index 100%
rename from Code/lsrmGraphOperations.h
rename to include/lsrmGraphOperations.h
diff --git a/Code/lsrmGraphOperations.txx b/include/lsrmGraphOperations.txx
similarity index 100%
rename from Code/lsrmGraphOperations.txx
rename to include/lsrmGraphOperations.txx
diff --git a/Code/lsrmGraphToOtbImage.h b/include/lsrmGraphToOtbImage.h
similarity index 100%
rename from Code/lsrmGraphToOtbImage.h
rename to include/lsrmGraphToOtbImage.h
diff --git a/Code/lsrmGraphToOtbImage.h~ b/include/lsrmGraphToOtbImage.h~
similarity index 100%
rename from Code/lsrmGraphToOtbImage.h~
rename to include/lsrmGraphToOtbImage.h~
diff --git a/Code/lsrmGraphToOtbImage.txx b/include/lsrmGraphToOtbImage.txx
similarity index 100%
rename from Code/lsrmGraphToOtbImage.txx
rename to include/lsrmGraphToOtbImage.txx
diff --git a/Code/lsrmGraphToOtbImage.txx~ b/include/lsrmGraphToOtbImage.txx~
similarity index 100%
rename from Code/lsrmGraphToOtbImage.txx~
rename to include/lsrmGraphToOtbImage.txx~
diff --git a/Code/lsrmNeighborhood.cpp b/include/lsrmNeighborhood.cpp
similarity index 100%
rename from Code/lsrmNeighborhood.cpp
rename to include/lsrmNeighborhood.cpp
diff --git a/Code/lsrmNeighborhood.h b/include/lsrmNeighborhood.h
similarity index 100%
rename from Code/lsrmNeighborhood.h
rename to include/lsrmNeighborhood.h
diff --git a/Code/lsrmSegmenter.h b/include/lsrmSegmenter.h
similarity index 100%
rename from Code/lsrmSegmenter.h
rename to include/lsrmSegmenter.h
diff --git a/Code/macro-generator.h b/include/macro-generator.h
similarity index 100%
rename from Code/macro-generator.h
rename to include/macro-generator.h