--- a/CMakeLists.txt	Tue May 06 12:52:28 2014 +0200
+++ b/CMakeLists.txt	Tue May 06 12:55:41 2014 +0200
@@ -172,9 +172,9 @@
   Core/MultiThreading/ReaderWriterLock.cpp
   Core/MultiThreading/SharedMessageQueue.cpp
   Core/MultiThreading/ThreadedCommandProcessor.cpp
-  Core/FileFormats/ImageAccessor.cpp
-  Core/FileFormats/PngReader.cpp
-  Core/FileFormats/PngWriter.cpp
+  Core/ImageFormats/ImageAccessor.cpp
+  Core/ImageFormats/PngReader.cpp
+  Core/ImageFormats/PngWriter.cpp
   Core/SQLite/Connection.cpp
   Core/SQLite/FunctionContext.cpp
   Core/SQLite/Statement.cpp
@@ -332,8 +332,8 @@
     ${ORTHANC_ROOT}/Core/MultiThreading/ArrayFilledByThreads.cpp
     ${ORTHANC_ROOT}/Core/MultiThreading/ThreadedCommandProcessor.cpp
     ${ORTHANC_ROOT}/Core/MultiThreading/SharedMessageQueue.cpp
-    ${ORTHANC_ROOT}/Core/FileFormats/ImageAccessor.cpp
-    ${ORTHANC_ROOT}/Core/FileFormats/PngReader.cpp
+    ${ORTHANC_ROOT}/Core/ImageFormats/ImageAccessor.cpp
+    ${ORTHANC_ROOT}/Core/ImageFormats/PngReader.cpp
     ${ORTHANC_ROOT}/OrthancCppClient/OrthancConnection.cpp
     ${ORTHANC_ROOT}/OrthancCppClient/Series.cpp
     ${ORTHANC_ROOT}/OrthancCppClient/Study.cpp