diff --git a/CMakeLists.txt b/CMakeLists.txt
index 126df3a2..5f0dd1e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(POLYVOX_VERSION_PATCH "0")
 SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}" CACHE STRING "PolyVox version")
 MARK_AS_ADVANCED(FORCE POLYVOX_VERSION)
 
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
 include(FeatureSummary)
 
 FIND_PACKAGE(Doxygen)
diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
index 8288ebe8..ead47966 100644
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -15,6 +15,7 @@ if(SPHINXBUILD_EXECUTABLE)
 		COMMENT "Building PolyVox manual"
 	)
 	add_dependencies(manual doc)
+	SET_PROPERTY(TARGET manual PROPERTY FOLDER "documentation")
 else()
 	if(NOT SPHINXBUILD_EXECUTABLE)
 		message(STATUS "`sphinx-build` was not found. Try setting SPHINXBUILD_EXECUTABLE to its location.")
diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt
index 20c97eb8..84d5c992 100644
--- a/examples/Basic/CMakeLists.txt
+++ b/examples/Basic/CMakeLists.txt
@@ -38,6 +38,7 @@ IF(MSVC)
 	SET_TARGET_PROPERTIES(BasicExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127")
 ENDIF(MSVC)
 TARGET_LINK_LIBRARIES(BasicExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore)
+SET_PROPERTY(TARGET BasicExample PROPERTY FOLDER "examples/Basic")
 
 #Install - Only install the example in Windows
 IF(WIN32)
diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt
index fe9a9139..1af21cf2 100644
--- a/examples/OpenGL/CMakeLists.txt
+++ b/examples/OpenGL/CMakeLists.txt
@@ -44,6 +44,7 @@ IF(MSVC)
 	SET_TARGET_PROPERTIES(OpenGLExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127")
 ENDIF(MSVC)
 TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore)
+SET_PROPERTY(TARGET OpenGLExample PROPERTY FOLDER "examples/OpenGL")
 
 #Install - Only install the example in Windows
 IF(WIN32)
diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt
index 1444eff6..b5e6eb0e 100644
--- a/examples/Paging/CMakeLists.txt
+++ b/examples/Paging/CMakeLists.txt
@@ -40,6 +40,7 @@ IF(MSVC)
 	SET_TARGET_PROPERTIES(PagingExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127")
 ENDIF(MSVC)
 TARGET_LINK_LIBRARIES(PagingExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore)
+SET_PROPERTY(TARGET PagingExample PROPERTY FOLDER "examples/Paging")
 
 #Install - Only install the example in Windows
 IF(WIN32)
diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt
index e282fcf8..62998a6d 100644
--- a/examples/SmoothLOD/CMakeLists.txt
+++ b/examples/SmoothLOD/CMakeLists.txt
@@ -38,6 +38,7 @@ IF(MSVC)
 	SET_TARGET_PROPERTIES(SmoothLODExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") #All warnings
 ENDIF(MSVC)
 TARGET_LINK_LIBRARIES(SmoothLODExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore)
+SET_PROPERTY(TARGET SmoothLODExample PROPERTY FOLDER "examples/SmoothLOD")
 
 #Install - Only install the example in Windows
 IF(WIN32)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 4232ed7b..0e2507d5 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -38,6 +38,7 @@ if(DOXYGEN_FOUND)
 		VERBATIM
 	)
 	set_target_properties(doc PROPERTIES PROJECT_LABEL "Documentation") #Set label seen in IDE
+	set_property(TARGET doc PROPERTY FOLDER "library/doc")
 	
 	#If we found qcollectiongenerator then do more processing
 	if(QT_QCOLLECTIONGENERATOR_EXECUTABLE)
diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt
index 474f1e47..9e5dbd0b 100644
--- a/library/PolyVoxCore/CMakeLists.txt
+++ b/library/PolyVoxCore/CMakeLists.txt
@@ -122,6 +122,7 @@ IF(LIBRARY_TYPE STREQUAL "DYNAMIC")
 	ADD_LIBRARY(PolyVoxCore SHARED ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES})
 	SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS")
 ENDIF()
+SET_PROPERTY(TARGET PolyVoxCore PROPERTY FOLDER "library/PolyVoxCore")
 
 SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR})
 IF(MSVC)
diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt
index 596184d1..0c4cd560 100644
--- a/library/PolyVoxUtil/CMakeLists.txt
+++ b/library/PolyVoxUtil/CMakeLists.txt
@@ -39,6 +39,7 @@ IF(LIBRARY_TYPE STREQUAL "DYNAMIC")
 	ADD_LIBRARY(PolyVoxUtil SHARED ${UTIL_SRC_FILES} ${UTIL_INC_FILES})
 	SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS")
 ENDIF()
+SET_PROPERTY(TARGET PolyVoxUtil PROPERTY FOLDER "library/PolyVoxUtil")
 
 TARGET_LINK_LIBRARIES(PolyVoxUtil PolyVoxCore)
 SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR})
diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt
index bcaae8ac..6d37c573 100644
--- a/library/bindings/CMakeLists.txt
+++ b/library/bindings/CMakeLists.txt
@@ -25,6 +25,7 @@ if(ENABLE_BINDINGS)
 		swig_add_module(PolyVoxCore python PolyVoxCore.i)
 		swig_link_libraries(PolyVoxCore ${PYTHON_LIBRARIES} PolyVoxCore)
 		#set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd")
+		SET_PROPERTY(TARGET ${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTY FOLDER "library/bindings")
 	else()
 		set(BUILD_BINDINGS OFF CACHE BOOL "Will the bindings be built" FORCE)
 	endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a554d8d7..e0b57e70 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -14,6 +14,7 @@ MACRO(CREATE_TEST headerfile sourcefile executablename)
 	ELSE(WIN32)
 		SET(LATEST_TEST ${CMAKE_CURRENT_BINARY_DIR}/${executablename})
 	ENDIF(WIN32)
+	SET_PROPERTY(TARGET ${executablename} PROPERTY FOLDER "tests")
 ENDMACRO(CREATE_TEST)
 
 IF(NOT QT_QTTEST_FOUND)