diff --git a/CMake/FindMetis.cmake b/CMake/FindMetis.cmake
deleted file mode 100644
index 3025849b884181fe184dc35dc95856a1dfeb34e8..0000000000000000000000000000000000000000
--- a/CMake/FindMetis.cmake
+++ /dev/null
@@ -1,113 +0,0 @@
-# - Try to find Metis
-# Once done, this will define
-#
-#  Metis_FOUND - system has Metis
-#  Metis_INCLUDE_DIRS - the Metis include directories
-#  Metis_LIBRARIES - link these to use Metis
-#
-# If Metis is in a non usual place, provide Metis_DIR variable to cmake (cmake -DMetis_DIR=...)
-#
-# Franck Perignon, jan. 2011, from http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
-#
-# - On debian, metis is installed in /usr/include/metis, /usr/lib with both static and dynamic libs.
-# - The tgz file from Karypis lab does not include any installation process. Metis is compiled in the sources and the .h is in metis_src/Lib, while the .a is in
-#    metis_src/
-# For version checking we :
-#  - look at Metis_DIR var or look at the dir that contains libmetis and check if it contains a VERSION file. 
-#  - if not we look at dynamic lib extension (if it exists ...)
-#  - if not, we check the name of this dir and check if it contain version info
-#  - if everything fails, well, we stop! 
-
-include(LibFindMacros)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(Metis_PKGCONF Metis)
-
-# Include dir
-find_path(
-  Metis_INCLUDE_DIR
-  NAMES metis.h 
-  #NO_CMAKE_ENVIRONMENT_PATH
-  PATHS ${Metis_DIR} PATHS ENV INCLUDE ENV PATH ${Metis_PKGCONF_INCLUDE_DIRS}
-  PATH_SUFFIXES Lib metis
-  NO_DEFAULT_PATH
-)
-find_path(
-  Metis_INCLUDE_DIR
-  NAMES metis.h 
-  PATH_SUFFIXES Lib metis
-)
-
-# Finally the library itself
-find_library(
-  Metis_LIBRARY
-  NAMES metis
-  PATHS ${Metis_DIR} ENV LIBRARY_PATH ENV LD_LIBRARY_PATH  ${Metis_PKGCONF_LIBRARY_DIRS} 
-  NO_DEFAULT_PATH
-  )
-find_library(
-  Metis_LIBRARY
-  NAMES metis
-  )
-
-
-
-# Try to find Metis version
-get_filename_component(PathToMetisLib ${Metis_LIBRARY} PATH)
-get_filename_component(PathToMetisLib ${Metis_LIBRARY} PATH)
-if(EXISTS ${PathToMetisLib}/VERSION)
-  file(READ "${PathToMetisLib}/VERSION" _metis_version_contents )
-  string(SUBSTRING ${_metis_version_contents} 6 5 version_number)
-else(EXISTS ${PathToMetisLib}/VERSION)
-  # if dynamic lib ...
-  if(EXISTS ${PathToMetisLib}/libmetis${CMAKE_SHARED_LIBRARY_SUFFIX})
-    get_filename_component(_metisLibExt ${PathToMetisLib}/libmetis${CMAKE_SHARED_LIBRARY_SUFFIX} REALPATH)
-    get_filename_component(_metisLibExt ${_metisLibExt} EXT)
-    string(REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}." "" version_number ${_metisLibExt})
-  else(EXISTS ${PathToMetisLib}/libmetis${CMAKE_SHARED_LIBRARY_SUFFIX})
-    get_filename_component(_metisDir ${PathToMetisLib} NAME)
-    string(SUBSTRING ${_metisDir} 6 5 version_number)
-    display(_metisDir)
-  endif(EXISTS ${PathToMetisLib}/libmetis${CMAKE_SHARED_LIBRARY_SUFFIX})
-endif(EXISTS ${PathToMetisLib}/VERSION)
-
-if(Metis_FIND_VERSION)
-  unset(Metis_HAVE_PROPER_VERSION)
-  # If the user didn't specify a patchlevel, it's 0.
-  if (NOT Metis_FIND_VERSION_PATCH)
-    set(Metis_FIND_VERSION_PATCH 0)
-    set(Metis_FIND_VERSION ${Metis_FIND_VERSION_MAJOR}.${Metis_FIND_VERSION_MINOR}.0)
-  endif (NOT Metis_FIND_VERSION_PATCH)
-  # if version number didn't specify a patchlevel, it's 0.
-  string(REGEX MATCHALL "[.]" nbPoints ${version_number})
-  list(LENGTH nbPoints l_version)
-  set(extended_version_number ${version_number})
-  if(l_version LESS 2 )
-    string(REPLACE ${version_number} "${version_number}.0" extended_version_number ${version_number})
-  endif(l_version LESS 2)
-  if(version_number)
-    # if less than expected ...
-    if(NOT extended_version_number VERSION_LESS Metis_FIND_VERSION )
-      set(Metis_HAVE_PROPER_VERSION TRUE)
-    endif(NOT extended_version_number VERSION_LESS Metis_FIND_VERSION )
-  else(version_number)
-    set(version_number "unknown")
-  endif(version_number)
-  if(Metis_HAVE_PROPER_VERSION)
-    message(STATUS "Found Metis version ${version_number}")
-  else(Metis_HAVE_PROPER_VERSION)
-    if(Metis_FIND_REQUIRED)
-      message(FATAL_ERROR "Metis expected version not found : found ${version_number} while ${Metis_FIND_VERSION} was required. Try to set another metis location (for example by using Metis_DIR option) with a more recent version.")
-    else(Metis_FIND_REQUIRED) # else just a warning
-      message(WARNING "Found Metis ${version_number} while ${Metis_FIND_VERSION} was expected")
-    endif(Metis_FIND_REQUIRED)
-  endif(Metis_HAVE_PROPER_VERSION)
-else(Metis_FIND_VERSION)
-  message(STATUS "Found Metis version ${version_number}.")
-endif(Metis_FIND_VERSION)
-      
-set(Metis_PROCESS_INCLUDES Metis_INCLUDE_DIR)
-set(Metis_PROCESS_LIBS Metis_LIBRARY)
-libfind_process(Metis)
-
-
diff --git a/CMake/CMakeListsForTests.cmake b/HySoP/CMake/CMakeListsForTests.cmake
similarity index 100%
rename from CMake/CMakeListsForTests.cmake
rename to HySoP/CMake/CMakeListsForTests.cmake
diff --git a/CMake/FindFFTW.cmake b/HySoP/CMake/FindFFTW.cmake
similarity index 100%
rename from CMake/FindFFTW.cmake
rename to HySoP/CMake/FindFFTW.cmake
diff --git a/CMake/InstallPackage.cmake b/HySoP/CMake/InstallPackage.cmake
similarity index 100%
rename from CMake/InstallPackage.cmake
rename to HySoP/CMake/InstallPackage.cmake
diff --git a/CMake/LibFindMacros.cmake b/HySoP/CMake/LibFindMacros.cmake
similarity index 100%
rename from CMake/LibFindMacros.cmake
rename to HySoP/CMake/LibFindMacros.cmake
diff --git a/CMake/MyTools.cmake b/HySoP/CMake/MyTools.cmake
similarity index 100%
rename from CMake/MyTools.cmake
rename to HySoP/CMake/MyTools.cmake
diff --git a/CMake/OutOfSourceBuild.cmake b/HySoP/CMake/OutOfSourceBuild.cmake
similarity index 100%
rename from CMake/OutOfSourceBuild.cmake
rename to HySoP/CMake/OutOfSourceBuild.cmake
diff --git a/CMake/TestFortranAcceptsFlag.cmake b/HySoP/CMake/TestFortranAcceptsFlag.cmake
similarity index 100%
rename from CMake/TestFortranAcceptsFlag.cmake
rename to HySoP/CMake/TestFortranAcceptsFlag.cmake
diff --git a/HySoP/hysop/particular_solvers/GPUParticularSolver.py b/HySoP/hysop/particular_solvers/GPUParticularSolver.py
index f87f518524d17e4385644487abdf7362d1e619df..a5f6cbc64f466cb7166fc6f8d16402c40aca90a1 100644
--- a/HySoP/hysop/particular_solvers/GPUParticularSolver.py
+++ b/HySoP/hysop/particular_solvers/GPUParticularSolver.py
@@ -6,7 +6,7 @@ GPU Particular solver description.
 import os
 import pyopencl as cl
 from ..Param import *
-from ParticularSolver import ParticularSolver
+from particular_solver import ParticularSolver
 from ..Domain.ParticleField import ParticleField
 from ..Variable.DiscreteVariable import DiscreteVariable
 from ..Operator.RemeshingDOp import RemeshingDOp
diff --git a/HySoP/hysop/particular_solvers/GPUParticularSolver_GLRender.py b/HySoP/hysop/particular_solvers/GPUParticularSolver_GLRender.py
index 24432e7715d14ff791e0137f3a1d700ce878b218..90a16bf0401ddbdc51e2be1c51eca6754a42a1c5 100644
--- a/HySoP/hysop/particular_solvers/GPUParticularSolver_GLRender.py
+++ b/HySoP/hysop/particular_solvers/GPUParticularSolver_GLRender.py
@@ -7,7 +7,7 @@ import os
 import sys
 import pyopencl as cl
 from ..Param import *
-from ParticularSolver import ParticularSolver
+from particular_solver import ParticularSolver
 from GPUParticularSolver import GPUParticularSolver
 from ..Domain.ParticleField import ParticleField
 from ..Variable.DiscreteVariable import DiscreteVariable
diff --git a/HySoP/setup.py.in b/HySoP/setup.py.in
index 085e204145c536417b166290306e9cb4b43013b1..fdae55100eb3bfd2cf59b6b2298cdd0e1cb75791 100644
--- a/HySoP/setup.py.in
+++ b/HySoP/setup.py.in
@@ -19,7 +19,7 @@ packages = ['parmepy',
             'parmepy.fields',
             'parmepy.operator',
             'parmepy.problem',
-            'parmepy.ParticularSolvers',
+            'parmepy.particular_solvers',
             'parmepy.tools']
 #            'examples']
 #            'new_ParMePy',