diff --git a/.gitignore b/.gitignore
index 19518327..7f4756c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 /build/
-/lib/
-/bin/Debug/
-/bin/Release/
-/bin/data/log/
+/bin/app/Debug/
+/bin/app/Release/
+/bin/app/data/log/
+/bin/lib/
+/bin/test/Debug/
+/bin/test/Release/
+/bin/test/data/log/
 
 .DS_Store
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 069d046f..285b7751 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,22 +20,14 @@ endif()
 
 # Settings ---------------------------------------------------------------------
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
-
 if (UNIX)
 	add_definitions(-std=c++11 -Wno-unknown-warning-option)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
-else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 endif ()
 
-
 # Project ----------------------------------------------------------------------
 
 project(${PROJECT_NAME})
 
-
 # Clang ------------------------------------------------------------------------
 
 find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
@@ -54,6 +46,8 @@ find_package( Boost 1.55 COMPONENTS system filesystem REQUIRED )
 
 # Lib --------------------------------------------------------------------------
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib)
 
 add_subdirectory(src/lib)
 add_subdirectory(src/external)
@@ -89,6 +83,12 @@ target_link_libraries(${LIB_PROJECT_NAME} ${CLANG_LIBRARIES} ${LLVM_AVAILABLE_LI
 
 # App --------------------------------------------------------------------------
 
+if (UNIX)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
+else ()
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
+endif ()
+
 add_subdirectory(src/app)
 
 # Find includes in corresponding build directories
@@ -129,6 +129,12 @@ set(CMAKE_AUTOMOC OFF)
 
 # CxxTest ----------------------------------------------------------------------
 
+if (UNIX)
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/${CMAKE_BUILD_TYPE})
+else ()
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/)
+endif ()
+
 add_subdirectory(src/test)
 
 set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
@@ -166,7 +172,7 @@ if (WIN32)
 	add_custom_command(
 		TARGET ${TEST_PROJECT_NAME}
 		POST_BUILD
-		COMMAND cd $(ProjectDir)../bin/\n$(OutDir)$(TargetName)$(TargetExt)
+		COMMAND cd $(ProjectDir)../bin/test/\n$(OutDir)$(TargetName)$(TargetExt)
 		COMMENT "Running unittest code"
 	)
 
diff --git a/bin/app/data/ProjectSettings.xml b/bin/app/data/ProjectSettings.xml
new file mode 100644
index 00000000..cdc9c1fc
--- /dev/null
+++ b/bin/app/data/ProjectSettings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<SourcePath>data/src</SourcePath>
+</config>
\ No newline at end of file
diff --git a/bin/data/src/Settings/player.h b/bin/test/data/src/Settings/player.h
similarity index 100%
rename from bin/data/src/Settings/player.h
rename to bin/test/data/src/Settings/player.h
diff --git a/bin/data/src/Settings/sample.cpp b/bin/test/data/src/Settings/sample.cpp
similarity index 100%
rename from bin/data/src/Settings/sample.cpp
rename to bin/test/data/src/Settings/sample.cpp
diff --git a/bin/data/src/Sound.hpp b/bin/test/data/src/Sound.hpp
similarity index 100%
rename from bin/data/src/Sound.hpp
rename to bin/test/data/src/Sound.hpp
diff --git a/bin/data/src/main.cpp b/bin/test/data/src/main.cpp
similarity index 100%
rename from bin/data/src/main.cpp
rename to bin/test/data/src/main.cpp
diff --git a/bin/data/src/tictactoe.h b/bin/test/data/src/tictactoe.h
similarity index 100%
rename from bin/data/src/tictactoe.h
rename to bin/test/data/src/tictactoe.h
diff --git a/bin/data/test_ProjectSettings.xml b/bin/test/data/test_ProjectSettings.xml
similarity index 100%
rename from bin/data/test_ProjectSettings.xml
rename to bin/test/data/test_ProjectSettings.xml
diff --git a/bin/data/test_code.cpp b/bin/test/data/test_code.cpp
similarity index 100%
rename from bin/data/test_code.cpp
rename to bin/test/data/test_code.cpp
diff --git a/bin/data/test_header.h b/bin/test/data/test_header.h
similarity index 100%
rename from bin/data/test_header.h
rename to bin/test/data/test_header.h
diff --git a/bin/data/test_text.txt b/bin/test/data/test_text.txt
similarity index 100%
rename from bin/data/test_text.txt
rename to bin/test/data/test_text.txt
diff --git a/script/clean.sh b/script/clean.sh
index 3a3bcf91..b6240709 100755
--- a/script/clean.sh
+++ b/script/clean.sh
@@ -8,8 +8,11 @@ cd $MY_PATH/..
 
 # Remove folders and contents
 rm -rf build
-rm -rf lib
-rm -rf bin/Debug
-rm -rf bin/Release
+rm -rf bin/app/Debug
+rm -rf bin/app/Release
+rm -rf bin/lib/Debug
+rm -rf bin/lib/Release
+rm -rf bin/test/Debug
+rm -rf bin/test/Release
 
 echo -e $SUCCESS "clean complete"
diff --git a/script/debug.sh b/script/debug.sh
index 0f335e2b..1bd65425 100755
--- a/script/debug.sh
+++ b/script/debug.sh
@@ -6,4 +6,4 @@ MY_PATH=`dirname "$0"`
 cd $MY_PATH/..
 
 # Build and run target
-ninja -C build/Debug "$1" && cd bin && Debug/"$1"
\ No newline at end of file
+ninja -C build/Debug masterproject_"$1" && cd bin/"$1" && Debug/masterproject_"$1"
diff --git a/script/release.sh b/script/release.sh
index 3072b7e6..7b5675b6 100755
--- a/script/release.sh
+++ b/script/release.sh
@@ -6,4 +6,4 @@ MY_PATH=`dirname "$0"`
 cd $MY_PATH/..
 
 # Build and run target
-ninja -C build/Release "$1" && cd bin && Release/"$1"
\ No newline at end of file
+ninja -C build/Release masterproject_"$1" && cd bin/"$1" && Release/masterproject_"$1"
diff --git a/script/setup.sh b/script/setup.sh
index 37a7cdef..958624c8 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -30,15 +30,21 @@ cp .git_pre_commit_hook.sh .git/hooks/pre-commit
 echo -e $INFO "create build folders"
 
 mkdir -p build
-mkdir -p lib
-mkdir -p bin/Debug
-mkdir -p bin/Release
+mkdir -p bin/app/Debug
+mkdir -p bin/app/Release
+mkdir -p bin/lib/Debug
+mkdir -p bin/lib/Release
+mkdir -p bin/test/Debug
+mkdir -p bin/test/Release
 
 # Copy necessary dynamic libraries to bin folder
 if [ $PLATFORM == "Windows" ]; then
 	echo -e $INFO "copy dynamic libraries"
-	cp -u -r setup/dynamic_libraries/windows/Debug/* bin/Debug
-	cp -u -r setup/dynamic_libraries/windows/Release/* bin/Release
+	cp -u -r setup/dynamic_libraries/windows/app/Debug/* bin/app/Debug
+	cp -u -r setup/dynamic_libraries/windows/app/Release/* bin/app/Release
+
+	cp -u -r setup/dynamic_libraries/windows/test/Debug/* bin/test/Debug
+	cp -u -r setup/dynamic_libraries/windows/test/Release/* bin/test/Release
 
 	echo -e $INFO "copy test_main file"
 	cp -u setup/cxx_test/windows/test_main.cpp build
diff --git a/setup/dynamic_libraries/windows/Debug/Qt5Cored.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/Qt5Cored.dll
rename to setup/dynamic_libraries/windows/app/Debug/Qt5Cored.dll
diff --git a/setup/dynamic_libraries/windows/Debug/Qt5Guid.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/Qt5Guid.dll
rename to setup/dynamic_libraries/windows/app/Debug/Qt5Guid.dll
diff --git a/setup/dynamic_libraries/windows/Debug/Qt5Widgetsd.dll b/setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/Qt5Widgetsd.dll
rename to setup/dynamic_libraries/windows/app/Debug/Qt5Widgetsd.dll
diff --git a/setup/dynamic_libraries/windows/Debug/boost_filesystem-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc110-mt-gd-1_55.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/boost_filesystem-vc110-mt-gd-1_55.dll
rename to setup/dynamic_libraries/windows/app/Debug/boost_filesystem-vc110-mt-gd-1_55.dll
diff --git a/setup/dynamic_libraries/windows/Debug/boost_system-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/app/Debug/boost_system-vc110-mt-gd-1_55.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/boost_system-vc110-mt-gd-1_55.dll
rename to setup/dynamic_libraries/windows/app/Debug/boost_system-vc110-mt-gd-1_55.dll
diff --git a/setup/dynamic_libraries/windows/Debug/icudt51.dll b/setup/dynamic_libraries/windows/app/Debug/icudt51.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/icudt51.dll
rename to setup/dynamic_libraries/windows/app/Debug/icudt51.dll
diff --git a/setup/dynamic_libraries/windows/Debug/icuin51.dll b/setup/dynamic_libraries/windows/app/Debug/icuin51.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/icuin51.dll
rename to setup/dynamic_libraries/windows/app/Debug/icuin51.dll
diff --git a/setup/dynamic_libraries/windows/Debug/icuuc51.dll b/setup/dynamic_libraries/windows/app/Debug/icuuc51.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/icuuc51.dll
rename to setup/dynamic_libraries/windows/app/Debug/icuuc51.dll
diff --git a/setup/dynamic_libraries/windows/Debug/libEGLd.dll b/setup/dynamic_libraries/windows/app/Debug/libEGLd.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/libEGLd.dll
rename to setup/dynamic_libraries/windows/app/Debug/libEGLd.dll
diff --git a/setup/dynamic_libraries/windows/Debug/libGLESv2d.dll b/setup/dynamic_libraries/windows/app/Debug/libGLESv2d.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/libGLESv2d.dll
rename to setup/dynamic_libraries/windows/app/Debug/libGLESv2d.dll
diff --git a/setup/dynamic_libraries/windows/Debug/platforms/qwindowsd.dll b/setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Debug/platforms/qwindowsd.dll
rename to setup/dynamic_libraries/windows/app/Debug/platforms/qwindowsd.dll
diff --git a/setup/dynamic_libraries/windows/Release/Qt5Core.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Core.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/Qt5Core.dll
rename to setup/dynamic_libraries/windows/app/Release/Qt5Core.dll
diff --git a/setup/dynamic_libraries/windows/Release/Qt5Gui.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/Qt5Gui.dll
rename to setup/dynamic_libraries/windows/app/Release/Qt5Gui.dll
diff --git a/setup/dynamic_libraries/windows/Release/Qt5Widgets.dll b/setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/Qt5Widgets.dll
rename to setup/dynamic_libraries/windows/app/Release/Qt5Widgets.dll
diff --git a/setup/dynamic_libraries/windows/Release/boost_filesystem-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc110-mt-1_55.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/boost_filesystem-vc110-mt-1_55.dll
rename to setup/dynamic_libraries/windows/app/Release/boost_filesystem-vc110-mt-1_55.dll
diff --git a/setup/dynamic_libraries/windows/Release/boost_system-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/app/Release/boost_system-vc110-mt-1_55.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/boost_system-vc110-mt-1_55.dll
rename to setup/dynamic_libraries/windows/app/Release/boost_system-vc110-mt-1_55.dll
diff --git a/setup/dynamic_libraries/windows/Release/icudt51.dll b/setup/dynamic_libraries/windows/app/Release/icudt51.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/icudt51.dll
rename to setup/dynamic_libraries/windows/app/Release/icudt51.dll
diff --git a/setup/dynamic_libraries/windows/Release/icuin51.dll b/setup/dynamic_libraries/windows/app/Release/icuin51.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/icuin51.dll
rename to setup/dynamic_libraries/windows/app/Release/icuin51.dll
diff --git a/setup/dynamic_libraries/windows/Release/icuuc51.dll b/setup/dynamic_libraries/windows/app/Release/icuuc51.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/icuuc51.dll
rename to setup/dynamic_libraries/windows/app/Release/icuuc51.dll
diff --git a/setup/dynamic_libraries/windows/Release/libEGL.dll b/setup/dynamic_libraries/windows/app/Release/libEGL.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/libEGL.dll
rename to setup/dynamic_libraries/windows/app/Release/libEGL.dll
diff --git a/setup/dynamic_libraries/windows/Release/libGLESv2.dll b/setup/dynamic_libraries/windows/app/Release/libGLESv2.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/libGLESv2.dll
rename to setup/dynamic_libraries/windows/app/Release/libGLESv2.dll
diff --git a/setup/dynamic_libraries/windows/Release/platforms/qwindows.dll b/setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll
similarity index 100%
rename from setup/dynamic_libraries/windows/Release/platforms/qwindows.dll
rename to setup/dynamic_libraries/windows/app/Release/platforms/qwindows.dll
diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc110-mt-gd-1_55.dll
new file mode 100644
index 00000000..4a5fc426
Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Debug/boost_filesystem-vc110-mt-gd-1_55.dll differ
diff --git a/setup/dynamic_libraries/windows/test/Debug/boost_system-vc110-mt-gd-1_55.dll b/setup/dynamic_libraries/windows/test/Debug/boost_system-vc110-mt-gd-1_55.dll
new file mode 100644
index 00000000..8320a9a1
Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Debug/boost_system-vc110-mt-gd-1_55.dll differ
diff --git a/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc110-mt-1_55.dll
new file mode 100644
index 00000000..13da5e64
Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Release/boost_filesystem-vc110-mt-1_55.dll differ
diff --git a/setup/dynamic_libraries/windows/test/Release/boost_system-vc110-mt-1_55.dll b/setup/dynamic_libraries/windows/test/Release/boost_system-vc110-mt-1_55.dll
new file mode 100644
index 00000000..cab758b0
Binary files /dev/null and b/setup/dynamic_libraries/windows/test/Release/boost_system-vc110-mt-1_55.dll differ
diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp
index a8457fdf..8a999a17 100644
--- a/src/lib/Application.cpp
+++ b/src/lib/Application.cpp
@@ -35,6 +35,6 @@ void Application::loadProject()
 	m_componentManager->setup();
 	m_project = Project::create(m_codeAccess, m_graphAccess);
 
-	m_project->loadProjectSettings("data/test_ProjectSettings.xml");
+	m_project->loadProjectSettings("data/ProjectSettings.xml");
 	m_project->parseCode();
 }