diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
index e59cb192b1..0f915b8121 100644
--- a/tools/auto-tester/CMakeLists.txt
+++ b/tools/auto-tester/CMakeLists.txt
@@ -1,13 +1,25 @@
 set(TARGET_NAME auto-tester)
 
 setup_hifi_project(Widgets)
+link_hifi_libraries()
 
-# grab the ui files in ui
-file (GLOB_RECURSE QT_UI_FILES src/ui/*.ui)
+# grab the implementation and header files from src dirs
+file(GLOB_RECURSE INTERFACE_SRCS "src/*.cpp" "src/*.h")
+GroupSources("src")
+
+find_package(
+  Qt5 COMPONENTS
+  Gui Multimedia Network OpenGL Qml Quick Script Svg
+  ${PLATFORM_QT_COMPONENTS}
+  WebChannel WebSockets
+)
+
+# grab the ui files in resources/ui
+file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
 source_group("UI Files" FILES ${QT_UI_FILES})
 
 # have qt5 wrap them and generate the appropriate header files
 qt5_wrap_ui(QT_UI_HEADERS "${QT_UI_FILES}")
 
 # add them to the interface source files
-##set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}")
+set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")
diff --git a/tools/auto-tester/src/Test.h b/tools/auto-tester/src/Test.h
index 5f63c71399..ab1c164671 100644
--- a/tools/auto-tester/src/Test.h
+++ b/tools/auto-tester/src/Test.h
@@ -16,7 +16,7 @@
 #include <QMessagebox>
 #include <QRegularExpression>
 
-#include "MismatchWindow.h"
+#include "ui/MismatchWindow.h"
 
 class Test {
 public: 
diff --git a/tools/auto-tester/src/main.cpp b/tools/auto-tester/src/main.cpp
index d8b23f5342..880741f172 100644
--- a/tools/auto-tester/src/main.cpp
+++ b/tools/auto-tester/src/main.cpp
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 #include <QtWidgets/QApplication>
-#include "autoTester.h"
+#include "ui/autoTester.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/tools/auto-tester/src/AutoTester.cpp b/tools/auto-tester/src/ui/AutoTester.cpp
similarity index 100%
rename from tools/auto-tester/src/AutoTester.cpp
rename to tools/auto-tester/src/ui/AutoTester.cpp
diff --git a/tools/auto-tester/src/MismatchWindow.cpp b/tools/auto-tester/src/ui/MismatchWindow.cpp
similarity index 100%
rename from tools/auto-tester/src/MismatchWindow.cpp
rename to tools/auto-tester/src/ui/MismatchWindow.cpp
diff --git a/tools/auto-tester/src/MismatchWindow.h b/tools/auto-tester/src/ui/MismatchWindow.h
similarity index 97%
rename from tools/auto-tester/src/MismatchWindow.h
rename to tools/auto-tester/src/ui/MismatchWindow.h
index 7aa173cc36..b4fd522026 100644
--- a/tools/auto-tester/src/MismatchWindow.h
+++ b/tools/auto-tester/src/ui/MismatchWindow.h
@@ -12,7 +12,7 @@
 
 #include "ui_MismatchWindow.h"
 
-#include "common.h"
+#include "../common.h"
 
 class MismatchWindow : public QDialog, public Ui::MismatchWindow
 {
diff --git a/tools/auto-tester/src/autoTester.h b/tools/auto-tester/src/ui/autoTester.h
similarity index 97%
rename from tools/auto-tester/src/autoTester.h
rename to tools/auto-tester/src/ui/autoTester.h
index 245937a5c7..fe09e440da 100644
--- a/tools/auto-tester/src/autoTester.h
+++ b/tools/auto-tester/src/ui/autoTester.h
@@ -13,7 +13,7 @@
 
 #include <QtWidgets/QMainWindow>
 #include "ui_autoTester.h"
-#include "Test.h"
+#include "../Test.h"
 
 class AutoTester : public QMainWindow
 {
diff --git a/tools/auto-tester/src/ui/MismatchWindow.ui b/tools/auto-tester/ui/MismatchWindow.ui
similarity index 100%
rename from tools/auto-tester/src/ui/MismatchWindow.ui
rename to tools/auto-tester/ui/MismatchWindow.ui
diff --git a/tools/auto-tester/src/ui/autoTester.ui b/tools/auto-tester/ui/autoTester.ui
similarity index 100%
rename from tools/auto-tester/src/ui/autoTester.ui
rename to tools/auto-tester/ui/autoTester.ui