diff --git a/CMakeLists.txt b/CMakeLists.txt
index c332c84..63964c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
   
-project(sim_us_server LANGUAGES CXX)
+project(remote-ui LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -25,6 +25,8 @@ if(NOT EMSCRIPTEN)
 add_subdirectory(UI)
 endif()
 
+add_subdirectory(client)
+
 # contains an "external" library we will link to
 add_subdirectory(external)
 
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index a7ec5aa..078f2ab 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,8 +1,6 @@
 find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets Svg WebSockets)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Svg WebSockets)
 
-add_subdirectory(qwt)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 file(GLOB_RECURSE ui "ui/*")
@@ -65,22 +63,8 @@ target_include_directories(unisim_client
 
 target_link_libraries(unisim_client PRIVATE qwt spdlog Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::WebSockets magic_enum::magic_enum nlohmann_json::nlohmann_json git_tag)
 
-# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
-# If you are developing for iOS or macOS you should consider setting an
-# explicit, fixed bundle identifier manually though.
-if(${QT_VERSION} VERSION_LESS 6.1.0)
-  set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.Simulator-CVS_I10)
-endif()
-set_target_properties(Simulator-CVS_I10 PROPERTIES
-    ${BUNDLE_ID_OPTION}
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    MACOSX_BUNDLE TRUE
-    WIN32_EXECUTABLE TRUE
-)
-
 include(GNUInstallDirs)
-install(TARGETS Simulator-CVS_I10
+install(TARGETS unisim_client
     BUNDLE DESTINATION .
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -117,4 +101,4 @@ if (NOT EMSCRIPTEN)
     endforeach()
 else()
     file(GLOB_RECURSE sims "simulators/*")
-endif()
\ No newline at end of file
+endif()