diff --git a/CMakeLists.txt b/CMakeLists.txt
index e059516..13eb43b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,18 +175,25 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
 
 add_subdirectory(standard_assets)
 
+SET(STANDARD_ASSET_BUNDLE "${CMAKE_BINARY_DIR}/output/assets/standard_assets.krbundle")
+
 add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/standard_assets.krbundle
-    COMMAND kraken_convert -o ${CMAKE_CURRENT_BINARY_DIR}/standard_assets.krbundle ${KRAKEN_STANDARD_ASSETS}
+    OUTPUT ${STANDARD_ASSET_BUNDLE}
+    COMMAND kraken_convert -o ${STANDARD_ASSET_BUNDLE} ${KRAKEN_STANDARD_ASSETS}
     DEPENDS kraken_convert ${KRAKEN_STANDARD_ASSETS}
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 	COMMENT "Creating Standard Assets"
 )
 
 add_custom_target(standard_assets ALL
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/standard_assets.krbundle
+    DEPENDS ${STANDARD_ASSET_BUNDLE}
     VERBATIM
 )
 
 add_subdirectory(tests)
 add_subdirectory(tools)
+
+set_target_properties( kraken PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY_DEBUG   ${CMAKE_BINARY_DIR}/output/lib
+  RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/output/lib
+)
diff --git a/standard_assets/CMakeLists.txt b/standard_assets/CMakeLists.txt
index ad809d2..f0a0743 100644
--- a/standard_assets/CMakeLists.txt
+++ b/standard_assets/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(hrtf_kemar)
+add_standard_asset(font.tga)
 set(KRAKEN_STANDARD_ASSETS "${KRAKEN_STANDARD_ASSETS}" PARENT_SCOPE)
diff --git a/kraken_standard_assets_osx/font.tga b/standard_assets/font.tga
similarity index 100%
rename from kraken_standard_assets_osx/font.tga
rename to standard_assets/font.tga
diff --git a/tests/smoke/hello_cube/CMakeLists.txt b/tests/smoke/hello_cube/CMakeLists.txt
index 6217d24..2e2a754 100644
--- a/tests/smoke/hello_cube/CMakeLists.txt
+++ b/tests/smoke/hello_cube/CMakeLists.txt
@@ -15,3 +15,7 @@ target_include_directories(kraken_cube PRIVATE ${CMAKE_SOURCE_DIR}/hydra/include
 
 TARGET_LINK_LIBRARIES( kraken_cube kraken ${EXTRA_LIBS} )
 
+set_target_properties( kraken_cube PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY_DEBUG   ${CMAKE_BINARY_DIR}/output/bin
+  RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/output/bin
+)
diff --git a/tools/convert/CMakeLists.txt b/tools/convert/CMakeLists.txt
index 6d45716..165c714 100644
--- a/tools/convert/CMakeLists.txt
+++ b/tools/convert/CMakeLists.txt
@@ -17,3 +17,7 @@ target_include_directories(kraken_convert PRIVATE ${CMAKE_SOURCE_DIR}/hydra/incl
 
 TARGET_LINK_LIBRARIES( kraken_convert kraken ${EXTRA_LIBS} )
 
+set_target_properties( kraken_convert PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY_DEBUG   ${CMAKE_BINARY_DIR}/output/bin
+  RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/output/bin
+)