diff --git a/IO/CMakeLists.txt b/IO/CMakeLists.txt
index 89ced9d..38ac753 100644
--- a/IO/CMakeLists.txt
+++ b/IO/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 SET( SOURCES
-	ImageFile.cpp
+	"src/ImageFile.cpp"
 )
 
 SET( HEADERS
-	ImageLoader.h
-	ImageFile.h
+	"config/ImageLoader.h.in"
+	"include/ImageFile.h"
 )
 
 FIND_PACKAGE( PNG )
@@ -13,16 +13,17 @@ IF( PNG_FOUND )
 	INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} )
 	TARGET_LINK_LIBRARIES( ${PNG_LIBRARY} )
 
-	SET( SOURCES ${SOURCES} ImageLoaderPNG.cpp )
-	SET( HEADERS ${HEADERS} ImageLoaderPNG.h )
+	SET( SOURCES ${SOURCES} "src/ImageLoaderPNG.cpp" )
+	SET( HEADERS ${HEADERS} "src/ImageLoaderPNG.h" )
 ENDIF()
 
 CONFIGURE_FILE(
-	"ImageLoader.h.in"
-	"ImageLoader.h"
+	"config/ImageLoader.h.in"
+	"include/ImageLoader.h"
 )
 
-INCLUDE_DIRECTORIES( ${TexC_BINARY_DIR}/IO )
+INCLUDE_DIRECTORIES( ${TexC_BINARY_DIR}/IO/include )
+INCLUDE_DIRECTORIES( ${TexC_SOURCE_DIR}/IO/include )
 
 ADD_LIBRARY(TexCompIO
 	${SOURCES}
diff --git a/IO/ImageLoader.h.in b/IO/config/ImageLoader.h.in
similarity index 100%
rename from IO/ImageLoader.h.in
rename to IO/config/ImageLoader.h.in
diff --git a/IO/ImageFile.h b/IO/include/ImageFile.h
similarity index 100%
rename from IO/ImageFile.h
rename to IO/include/ImageFile.h
diff --git a/IO/ImageFile.cpp b/IO/src/ImageFile.cpp
similarity index 100%
rename from IO/ImageFile.cpp
rename to IO/src/ImageFile.cpp
diff --git a/IO/ImageLoaderPNG.cpp b/IO/src/ImageLoaderPNG.cpp
similarity index 100%
rename from IO/ImageLoaderPNG.cpp
rename to IO/src/ImageLoaderPNG.cpp
diff --git a/IO/ImageLoaderPNG.h b/IO/src/ImageLoaderPNG.h
similarity index 100%
rename from IO/ImageLoaderPNG.h
rename to IO/src/ImageLoaderPNG.h