diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77c892f20f..bc359ba7ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 project(hifi)
 
 add_subdirectory(space)
-add_subdirectory(avatar)
+add_subdirectory(avatar-mixer)
 add_subdirectory(domain)
 add_subdirectory(mixer)
 add_subdirectory(voxel)
diff --git a/avatar-mixer/CMakeLists.txt b/avatar-mixer/CMakeLists.txt
new file mode 100644
index 0000000000..34a58879f6
--- /dev/null
+++ b/avatar-mixer/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(TARGET_NAME "avatar-mixer")
+
+# setup the project
+include(../cmake/macros/SetupHifiProject.cmake)
+setup_hifi_project(${TARGET_NAME})
+
+# link the shared hifi library
+include(../cmake/macros/LinkHifiLibrary.cmake)
+link_hifi_library(shared ${TARGET_NAME})
+
+# link the threads library
+find_package(Threads REQUIRED)
+target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/avatar/src/AvatarAgentData.cpp b/avatar-mixer/src/AvatarAgentData.cpp
similarity index 100%
rename from avatar/src/AvatarAgentData.cpp
rename to avatar-mixer/src/AvatarAgentData.cpp
diff --git a/avatar/src/AvatarAgentData.h b/avatar-mixer/src/AvatarAgentData.h
similarity index 100%
rename from avatar/src/AvatarAgentData.h
rename to avatar-mixer/src/AvatarAgentData.h
diff --git a/avatar/src/main.cpp b/avatar-mixer/src/main.cpp
similarity index 100%
rename from avatar/src/main.cpp
rename to avatar-mixer/src/main.cpp
diff --git a/avatar/CMakeLists.txt b/avatar/CMakeLists.txt
deleted file mode 100644
index 68a7fa7763..0000000000
--- a/avatar/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(avatar)
-
-# grab the implemenation and header files
-file(GLOB AVATAR_SRCS src/*.cpp src/*.h)
-
-# add the executable
-add_executable(avatar ${AVATAR_SRCS})
-
-# link the shared hifi library
-include(../cmake/macros/LinkHifiLibrary.cmake)
-link_hifi_library(shared avatar)
-
-# link the threads library
-find_package(Threads REQUIRED)
-target_link_libraries(avatar ${CMAKE_THREAD_LIBS_INIT})
diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
new file mode 100644
index 0000000000..a85a1fa69e
--- /dev/null
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -0,0 +1,9 @@
+MACRO(SETUP_HIFI_PROJECT TARGET)
+    project(${TARGET})
+    
+    # grab the implemenation and header files
+    file(GLOB TARGET_SRCS /src/*.cpp src/*.h)
+    
+    # add the executable
+    add_executable(${TARGET} ${TARGET_SRCS})
+ENDMACRO(SETUP_HIFI_PROJECT _target)
\ No newline at end of file