diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8505710..5772eb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ else()
 endif()
 
 # Specify Installation Paths
-set(MCPI_INSTALL_DIR "opt/${MCPI_VARIANT_NAME}")
+set(MCPI_INSTALL_DIR "lib/${MCPI_VARIANT_NAME}")
 set(MCPI_LIB_DIR "${MCPI_INSTALL_DIR}/lib")
 set(MCPI_FALLBACK_LIB_DIR "${MCPI_INSTALL_DIR}/fallback-lib")
 
@@ -69,7 +69,7 @@ endif()
 
 # Specify Default Installation Prefix
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(CMAKE_INSTALL_PREFIX "/" CACHE PATH "" FORCE)
+    set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "" FORCE)
 endif()
 
 # Use LLD When Using Clang
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 612c762..6db07e9 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -11,7 +11,7 @@ if(BUILD_NATIVE_COMPONENTS)
     target_link_libraries(launcher reborn-headers)
     # Install
     install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}")
-    install_symlink("../../${MCPI_INSTALL_DIR}/launcher" "usr/bin/${MCPI_VARIANT_NAME}")
+    install_symlink("../../${MCPI_INSTALL_DIR}/launcher" "bin/${MCPI_VARIANT_NAME}")
     if(NOT MCPI_SERVER_MODE)
         install(DIRECTORY "client-data/" DESTINATION ".")
     endif()
diff --git a/launcher/client-data/opt/minecraft-pi-reborn-client/available-feature-flags b/launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags
similarity index 100%
rename from launcher/client-data/opt/minecraft-pi-reborn-client/available-feature-flags
rename to launcher/client-data/lib/minecraft-pi-reborn-client/available-feature-flags
diff --git a/launcher/client-data/usr/share/applications/minecraft-pi-reborn-client.desktop b/launcher/client-data/share/applications/minecraft-pi-reborn-client.desktop
similarity index 100%
rename from launcher/client-data/usr/share/applications/minecraft-pi-reborn-client.desktop
rename to launcher/client-data/share/applications/minecraft-pi-reborn-client.desktop
diff --git a/launcher/client-data/usr/share/pixmaps/minecraft-pi-reborn-client.png b/launcher/client-data/share/pixmaps/minecraft-pi-reborn-client.png
similarity index 100%
rename from launcher/client-data/usr/share/pixmaps/minecraft-pi-reborn-client.png
rename to launcher/client-data/share/pixmaps/minecraft-pi-reborn-client.png