--- a/CMakeLists.txt	Tue Jun 02 10:11:34 2015 +0200
+++ b/CMakeLists.txt	Tue Jun 02 10:22:49 2015 +0200
@@ -42,7 +42,7 @@
 ## Create the standalone DLL containing the Orthanc Client API
 #####################################################################
 
-include_directories(OrthancCppClient/SharedLibrary/Laaw)
+include_directories(Resources/Laaw)
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
   if (CMAKE_CROSSCOMPILING)
@@ -50,9 +50,9 @@
     set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
     if (${CMAKE_SIZEOF_VOID_P} EQUAL 4)
-      set(ORTHANC_CPP_CLIENT_AUX OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.def)
+      set(ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows32.def)
     elseif (${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-      set(ORTHANC_CPP_CLIENT_AUX OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.def)
+      set(ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows64.def)
     else()
       message(FATAL_ERROR "Support your platform here")
     endif()
@@ -62,10 +62,10 @@
 
   if (${CMAKE_SIZEOF_VOID_P} EQUAL 4)
     set(CMAKE_SHARED_LIBRARY_SUFFIX "_Windows32.dll")
-    list(APPEND ORTHANC_CPP_CLIENT_AUX OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc)
+    list(APPEND ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows32.rc)
   elseif (${CMAKE_SIZEOF_VOID_P} EQUAL 8)
     set(CMAKE_SHARED_LIBRARY_SUFFIX "_Windows64.dll")
-    list(APPEND ORTHANC_CPP_CLIENT_AUX OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc)
+    list(APPEND ORTHANC_CPP_CLIENT_AUX CppClient/SharedLibrary/AUTOGENERATED/Windows64.rc)
   else()
     message(FATAL_ERROR "Support your platform here")
   endif()    
@@ -88,14 +88,15 @@
   Orthanc/Resources/ThirdParty/base64/base64.cpp
   Orthanc/Resources/ThirdParty/md5/md5.c
 
-  OrthancCppClient/Instance.cpp
-  OrthancCppClient/OrthancConnection.cpp
-  OrthancCppClient/Patient.cpp
-  OrthancCppClient/Series.cpp
-  OrthancCppClient/SharedLibrary/SharedLibrary.cpp
-  OrthancCppClient/Study.cpp
-  OrthancCppClient/ArrayFilledByThreads.cpp
-  OrthancCppClient/ThreadedCommandProcessor.cpp
+  CppClient/Instance.cpp
+  CppClient/OrthancConnection.cpp
+  CppClient/Patient.cpp
+  CppClient/Series.cpp
+  CppClient/Study.cpp
+  CppClient/ArrayFilledByThreads.cpp
+  CppClient/ThreadedCommandProcessor.cpp
+
+  SharedLibrary/SharedLibrary.cpp
 
   ${ORTHANC_CPP_CLIENT_AUX}
   ${THIRD_PARTY_SOURCES}
@@ -114,7 +115,7 @@
     ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
     ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
   set_target_properties(OrthancClient
-    PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed -Wl,--version-script=${CMAKE_SOURCE_DIR}/OrthancCppClient/SharedLibrary/Laaw/VersionScript.map"
+    PROPERTIES LINK_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed -Wl,--version-script=${CMAKE_SOURCE_DIR}/Resources/Laaw/VersionScript.map"
     )
   target_link_libraries(OrthancClient pthread)
 
@@ -138,7 +139,7 @@
 
 # Set the version of the "Orthanc Client" shared library
 file(STRINGS
-  ${CMAKE_SOURCE_DIR}/OrthancCppClient/SharedLibrary/Product.json
+  ${CMAKE_SOURCE_DIR}/SharedLibrary/Product.json
   ORTHANC_CLIENT_VERSION_TMP
   REGEX "^[ \t]*\"Version\"[ \t]*")
 
@@ -160,7 +161,7 @@
 
 install(
   FILES
-  OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h 
+  CppClient/SharedLibrary/AUTOGENERATED/CppClient.h 
   DESTINATION include/orthanc
   )