diff --git a/.nvimrc b/.nvimrc
index 5bb56269..10106302 100644
--- a/.nvimrc
+++ b/.nvimrc
@@ -7,7 +7,7 @@ else
   let g:nmakeprg="./scripts/make_unix.sh"
   " let g:gtest#gtest_command = "cd build && ./unittests"
 endif
-set path+=.,repertory2/**
+set path+=.,repertory/**
 
 lua << EOF
 if vim.env.NV_DARCULA_ENABLE_DAP then
@@ -25,7 +25,7 @@ if vim.env.NV_DARCULA_ENABLE_DAP then
       type = type,
       request = "launch",
       program = function()
-        return gpath.create_path(cwd, "repertory2")
+        return gpath.create_path(cwd, "repertory")
       end,
       cwd = cwd,
       stopAtEntry = true,
@@ -36,7 +36,7 @@ if vim.env.NV_DARCULA_ENABLE_DAP then
       type = type,
       request = "launch",
       program = function()
-        return gpath.create_path(cwd, "repertory2_tests")
+        return gpath.create_path(cwd, "repertory_tests")
       end,
       cwd = cwd,
       stopAtEntry = true,
diff --git a/config.sh b/config.sh
index 2125a392..a4aba85d 100755
--- a/config.sh
+++ b/config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PROJECT_APP_NAME="repertory2"
+PROJECT_APP_NAME="repertory"
 
 PROJECT_ENABLE_BOOST=ON
 PROJECT_ENABLE_CPP_HTTPLIB=ON
diff --git a/project.cmake b/project.cmake
index e40cca9a..6016a8f4 100644
--- a/project.cmake
+++ b/project.cmake
@@ -17,8 +17,8 @@ set(REPERTORY_VER_FILEDESCRIPTION_STR "Mount utility for Sia and S3")
 # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/src/version.rc @ONLY)
 # set(WINDOWS_VERSION_RC ${CMAKE_CURRENT_SOURCE_DIR}/src/version.rc)
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/repertory2/librepertory2/src/common.cpp.in
-  ${CMAKE_CURRENT_SOURCE_DIR}/repertory2/librepertory2/src/common.cpp 
+  ${CMAKE_CURRENT_SOURCE_DIR}/repertory/librepertory/src/common.cpp.in
+  ${CMAKE_CURRENT_SOURCE_DIR}/repertory/librepertory/src/common.cpp 
   @ONLY
 )
 
diff --git a/project_name.cmake b/project_name.cmake
index 9d798af9..cff6cfb2 100644
--- a/project_name.cmake
+++ b/project_name.cmake
@@ -1 +1 @@
-set(PROJECT_NAME repertory2)
+set(PROJECT_NAME repertory)
diff --git a/repertory2/librepertory2/include/app_config.hpp b/repertory/librepertory/include/app_config.hpp
similarity index 100%
rename from repertory2/librepertory2/include/app_config.hpp
rename to repertory/librepertory/include/app_config.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/curl_comm.hpp b/repertory/librepertory/include/comm/curl/curl_comm.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/curl_comm.hpp
rename to repertory/librepertory/include/comm/curl/curl_comm.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/multi_request.hpp b/repertory/librepertory/include/comm/curl/multi_request.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/multi_request.hpp
rename to repertory/librepertory/include/comm/curl/multi_request.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/requests/http_delete.hpp b/repertory/librepertory/include/comm/curl/requests/http_delete.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/requests/http_delete.hpp
rename to repertory/librepertory/include/comm/curl/requests/http_delete.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/requests/http_get.hpp b/repertory/librepertory/include/comm/curl/requests/http_get.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/requests/http_get.hpp
rename to repertory/librepertory/include/comm/curl/requests/http_get.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/requests/http_head.hpp b/repertory/librepertory/include/comm/curl/requests/http_head.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/requests/http_head.hpp
rename to repertory/librepertory/include/comm/curl/requests/http_head.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/requests/http_post.hpp b/repertory/librepertory/include/comm/curl/requests/http_post.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/requests/http_post.hpp
rename to repertory/librepertory/include/comm/curl/requests/http_post.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/requests/http_put_file.hpp b/repertory/librepertory/include/comm/curl/requests/http_put_file.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/requests/http_put_file.hpp
rename to repertory/librepertory/include/comm/curl/requests/http_put_file.hpp
diff --git a/repertory2/librepertory2/include/comm/curl/requests/http_request_base.hpp b/repertory/librepertory/include/comm/curl/requests/http_request_base.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/curl/requests/http_request_base.hpp
rename to repertory/librepertory/include/comm/curl/requests/http_request_base.hpp
diff --git a/repertory2/librepertory2/include/comm/i_http_comm.hpp b/repertory/librepertory/include/comm/i_http_comm.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/i_http_comm.hpp
rename to repertory/librepertory/include/comm/i_http_comm.hpp
diff --git a/repertory2/librepertory2/include/comm/packet/client_pool.hpp b/repertory/librepertory/include/comm/packet/client_pool.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/packet/client_pool.hpp
rename to repertory/librepertory/include/comm/packet/client_pool.hpp
diff --git a/repertory2/librepertory2/include/comm/packet/packet.hpp b/repertory/librepertory/include/comm/packet/packet.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/packet/packet.hpp
rename to repertory/librepertory/include/comm/packet/packet.hpp
diff --git a/repertory2/librepertory2/include/comm/packet/packet_client.hpp b/repertory/librepertory/include/comm/packet/packet_client.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/packet/packet_client.hpp
rename to repertory/librepertory/include/comm/packet/packet_client.hpp
diff --git a/repertory2/librepertory2/include/comm/packet/packet_server.hpp b/repertory/librepertory/include/comm/packet/packet_server.hpp
similarity index 100%
rename from repertory2/librepertory2/include/comm/packet/packet_server.hpp
rename to repertory/librepertory/include/comm/packet/packet_server.hpp
diff --git a/repertory2/librepertory2/include/common.hpp b/repertory/librepertory/include/common.hpp
similarity index 96%
rename from repertory2/librepertory2/include/common.hpp
rename to repertory/librepertory/include/common.hpp
index 2efa8503..3344585d 100644
--- a/repertory2/librepertory2/include/common.hpp
+++ b/repertory/librepertory/include/common.hpp
@@ -157,7 +157,7 @@ using json = nlohmann::json;
 
 #define REPERTORY "repertory"
 #define REPERTORY_CONFIG_VERSION 0ull
-#define REPERTORY_DATA_NAME "repertory2"
+#define REPERTORY_DATA_NAME "repertory"
 #define REPERTORY_MIN_REMOTE_VERSION "2.0.0"
 #define REPERTORY_W L"repertory"
 
diff --git a/repertory2/librepertory2/include/database/db_common.hpp b/repertory/librepertory/include/database/db_common.hpp
similarity index 100%
rename from repertory2/librepertory2/include/database/db_common.hpp
rename to repertory/librepertory/include/database/db_common.hpp
diff --git a/repertory2/librepertory2/include/database/db_insert.hpp b/repertory/librepertory/include/database/db_insert.hpp
similarity index 100%
rename from repertory2/librepertory2/include/database/db_insert.hpp
rename to repertory/librepertory/include/database/db_insert.hpp
diff --git a/repertory2/librepertory2/include/database/db_select.hpp b/repertory/librepertory/include/database/db_select.hpp
similarity index 100%
rename from repertory2/librepertory2/include/database/db_select.hpp
rename to repertory/librepertory/include/database/db_select.hpp
diff --git a/repertory2/librepertory2/include/drives/directory_cache.hpp b/repertory/librepertory/include/drives/directory_cache.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/directory_cache.hpp
rename to repertory/librepertory/include/drives/directory_cache.hpp
diff --git a/repertory2/librepertory2/include/drives/directory_iterator.hpp b/repertory/librepertory/include/drives/directory_iterator.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/directory_iterator.hpp
rename to repertory/librepertory/include/drives/directory_iterator.hpp
diff --git a/repertory2/librepertory2/include/drives/eviction.hpp b/repertory/librepertory/include/drives/eviction.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/eviction.hpp
rename to repertory/librepertory/include/drives/eviction.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/events.hpp b/repertory/librepertory/include/drives/fuse/events.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/events.hpp
rename to repertory/librepertory/include/drives/fuse/events.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/fuse_base.hpp b/repertory/librepertory/include/drives/fuse/fuse_base.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/fuse_base.hpp
rename to repertory/librepertory/include/drives/fuse/fuse_base.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/fuse_drive.hpp b/repertory/librepertory/include/drives/fuse/fuse_drive.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/fuse_drive.hpp
rename to repertory/librepertory/include/drives/fuse/fuse_drive.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/fuse_drive_base.hpp b/repertory/librepertory/include/drives/fuse/fuse_drive_base.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/fuse_drive_base.hpp
rename to repertory/librepertory/include/drives/fuse/fuse_drive_base.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/i_fuse_drive.hpp b/repertory/librepertory/include/drives/fuse/i_fuse_drive.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/i_fuse_drive.hpp
rename to repertory/librepertory/include/drives/fuse/i_fuse_drive.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/remotefuse/i_remote_instance.hpp b/repertory/librepertory/include/drives/fuse/remotefuse/i_remote_instance.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/remotefuse/i_remote_instance.hpp
rename to repertory/librepertory/include/drives/fuse/remotefuse/i_remote_instance.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/remotefuse/remote_client.hpp b/repertory/librepertory/include/drives/fuse/remotefuse/remote_client.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/remotefuse/remote_client.hpp
rename to repertory/librepertory/include/drives/fuse/remotefuse/remote_client.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/remotefuse/remote_fuse_drive.hpp b/repertory/librepertory/include/drives/fuse/remotefuse/remote_fuse_drive.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/remotefuse/remote_fuse_drive.hpp
rename to repertory/librepertory/include/drives/fuse/remotefuse/remote_fuse_drive.hpp
diff --git a/repertory2/librepertory2/include/drives/fuse/remotefuse/remote_server.hpp b/repertory/librepertory/include/drives/fuse/remotefuse/remote_server.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/fuse/remotefuse/remote_server.hpp
rename to repertory/librepertory/include/drives/fuse/remotefuse/remote_server.hpp
diff --git a/repertory2/librepertory2/include/drives/remote/i_remote_json.hpp b/repertory/librepertory/include/drives/remote/i_remote_json.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/remote/i_remote_json.hpp
rename to repertory/librepertory/include/drives/remote/i_remote_json.hpp
diff --git a/repertory2/librepertory2/include/drives/remote/remote_open_file_table.hpp b/repertory/librepertory/include/drives/remote/remote_open_file_table.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/remote/remote_open_file_table.hpp
rename to repertory/librepertory/include/drives/remote/remote_open_file_table.hpp
diff --git a/repertory2/librepertory2/include/drives/remote/remote_server_base.hpp b/repertory/librepertory/include/drives/remote/remote_server_base.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/remote/remote_server_base.hpp
rename to repertory/librepertory/include/drives/remote/remote_server_base.hpp
diff --git a/repertory2/librepertory2/include/drives/winfsp/i_winfsp_drive.hpp b/repertory/librepertory/include/drives/winfsp/i_winfsp_drive.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/winfsp/i_winfsp_drive.hpp
rename to repertory/librepertory/include/drives/winfsp/i_winfsp_drive.hpp
diff --git a/repertory2/librepertory2/include/drives/winfsp/remotewinfsp/i_remote_instance.hpp b/repertory/librepertory/include/drives/winfsp/remotewinfsp/i_remote_instance.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/winfsp/remotewinfsp/i_remote_instance.hpp
rename to repertory/librepertory/include/drives/winfsp/remotewinfsp/i_remote_instance.hpp
diff --git a/repertory2/librepertory2/include/drives/winfsp/remotewinfsp/remote_client.hpp b/repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_client.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/winfsp/remotewinfsp/remote_client.hpp
rename to repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_client.hpp
diff --git a/repertory2/librepertory2/include/drives/winfsp/remotewinfsp/remote_server.hpp b/repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_server.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/winfsp/remotewinfsp/remote_server.hpp
rename to repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_server.hpp
diff --git a/repertory2/librepertory2/include/drives/winfsp/remotewinfsp/remote_winfsp_drive.hpp b/repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_winfsp_drive.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/winfsp/remotewinfsp/remote_winfsp_drive.hpp
rename to repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_winfsp_drive.hpp
diff --git a/repertory2/librepertory2/include/drives/winfsp/winfsp_drive.hpp b/repertory/librepertory/include/drives/winfsp/winfsp_drive.hpp
similarity index 100%
rename from repertory2/librepertory2/include/drives/winfsp/winfsp_drive.hpp
rename to repertory/librepertory/include/drives/winfsp/winfsp_drive.hpp
diff --git a/repertory2/librepertory2/include/events/consumers/console_consumer.hpp b/repertory/librepertory/include/events/consumers/console_consumer.hpp
similarity index 100%
rename from repertory2/librepertory2/include/events/consumers/console_consumer.hpp
rename to repertory/librepertory/include/events/consumers/console_consumer.hpp
diff --git a/repertory2/librepertory2/include/events/consumers/logging_consumer.hpp b/repertory/librepertory/include/events/consumers/logging_consumer.hpp
similarity index 100%
rename from repertory2/librepertory2/include/events/consumers/logging_consumer.hpp
rename to repertory/librepertory/include/events/consumers/logging_consumer.hpp
diff --git a/repertory2/librepertory2/include/events/event.hpp b/repertory/librepertory/include/events/event.hpp
similarity index 100%
rename from repertory2/librepertory2/include/events/event.hpp
rename to repertory/librepertory/include/events/event.hpp
diff --git a/repertory2/librepertory2/include/events/event_system.hpp b/repertory/librepertory/include/events/event_system.hpp
similarity index 100%
rename from repertory2/librepertory2/include/events/event_system.hpp
rename to repertory/librepertory/include/events/event_system.hpp
diff --git a/repertory2/librepertory2/include/events/events.hpp b/repertory/librepertory/include/events/events.hpp
similarity index 100%
rename from repertory2/librepertory2/include/events/events.hpp
rename to repertory/librepertory/include/events/events.hpp
diff --git a/repertory2/librepertory2/include/events/t_event_system.hpp b/repertory/librepertory/include/events/t_event_system.hpp
similarity index 100%
rename from repertory2/librepertory2/include/events/t_event_system.hpp
rename to repertory/librepertory/include/events/t_event_system.hpp
diff --git a/repertory2/librepertory2/include/file_manager/events.hpp b/repertory/librepertory/include/file_manager/events.hpp
similarity index 100%
rename from repertory2/librepertory2/include/file_manager/events.hpp
rename to repertory/librepertory/include/file_manager/events.hpp
diff --git a/repertory2/librepertory2/include/file_manager/file_manager.hpp b/repertory/librepertory/include/file_manager/file_manager.hpp
similarity index 100%
rename from repertory2/librepertory2/include/file_manager/file_manager.hpp
rename to repertory/librepertory/include/file_manager/file_manager.hpp
diff --git a/repertory2/librepertory2/include/file_manager/i_file_manager.hpp b/repertory/librepertory/include/file_manager/i_file_manager.hpp
similarity index 100%
rename from repertory2/librepertory2/include/file_manager/i_file_manager.hpp
rename to repertory/librepertory/include/file_manager/i_file_manager.hpp
diff --git a/repertory2/librepertory2/include/file_manager/i_open_file.hpp b/repertory/librepertory/include/file_manager/i_open_file.hpp
similarity index 100%
rename from repertory2/librepertory2/include/file_manager/i_open_file.hpp
rename to repertory/librepertory/include/file_manager/i_open_file.hpp
diff --git a/repertory2/librepertory2/include/file_manager/i_upload_manager.hpp b/repertory/librepertory/include/file_manager/i_upload_manager.hpp
similarity index 100%
rename from repertory2/librepertory2/include/file_manager/i_upload_manager.hpp
rename to repertory/librepertory/include/file_manager/i_upload_manager.hpp
diff --git a/repertory2/librepertory2/include/initialize.hpp b/repertory/librepertory/include/initialize.hpp
similarity index 89%
rename from repertory2/librepertory2/include/initialize.hpp
rename to repertory/librepertory/include/initialize.hpp
index 4f95fb27..7e9b54aa 100644
--- a/repertory2/librepertory2/include/initialize.hpp
+++ b/repertory/librepertory/include/initialize.hpp
@@ -19,8 +19,8 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
 */
-#ifndef LIBREPERTORY2_INCLUDE_INITIALIZE_HPP_
-#define LIBREPERTORY2_INCLUDE_INITIALIZE_HPP_
+#ifndef LIBREPERTORY_INCLUDE_INITIALIZE_HPP_
+#define LIBREPERTORY_INCLUDE_INITIALIZE_HPP_
 
 namespace repertory {
 void project_cleanup();
@@ -28,4 +28,4 @@ void project_cleanup();
 [[nodiscard]] auto project_initialize() -> bool;
 } // namespace repertory
 
-#endif // LIBREPERTORY2_INCLUDE_INITIALIZE_HPP_
+#endif // LIBREPERTORY_INCLUDE_INITIALIZE_HPP_
diff --git a/repertory2/librepertory2/include/platform/platform.hpp b/repertory/librepertory/include/platform/platform.hpp
similarity index 100%
rename from repertory2/librepertory2/include/platform/platform.hpp
rename to repertory/librepertory/include/platform/platform.hpp
diff --git a/repertory2/librepertory2/include/platform/unix_platform.hpp b/repertory/librepertory/include/platform/unix_platform.hpp
similarity index 100%
rename from repertory2/librepertory2/include/platform/unix_platform.hpp
rename to repertory/librepertory/include/platform/unix_platform.hpp
diff --git a/repertory2/librepertory2/include/platform/win32_platform.hpp b/repertory/librepertory/include/platform/win32_platform.hpp
similarity index 100%
rename from repertory2/librepertory2/include/platform/win32_platform.hpp
rename to repertory/librepertory/include/platform/win32_platform.hpp
diff --git a/repertory2/librepertory2/include/providers/base_provider.hpp b/repertory/librepertory/include/providers/base_provider.hpp
similarity index 100%
rename from repertory2/librepertory2/include/providers/base_provider.hpp
rename to repertory/librepertory/include/providers/base_provider.hpp
diff --git a/repertory2/librepertory2/include/providers/encrypt/encrypt_provider.hpp b/repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp
similarity index 100%
rename from repertory2/librepertory2/include/providers/encrypt/encrypt_provider.hpp
rename to repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp
diff --git a/repertory2/librepertory2/include/providers/i_provider.hpp b/repertory/librepertory/include/providers/i_provider.hpp
similarity index 100%
rename from repertory2/librepertory2/include/providers/i_provider.hpp
rename to repertory/librepertory/include/providers/i_provider.hpp
diff --git a/repertory2/librepertory2/include/providers/meta_db.hpp b/repertory/librepertory/include/providers/meta_db.hpp
similarity index 100%
rename from repertory2/librepertory2/include/providers/meta_db.hpp
rename to repertory/librepertory/include/providers/meta_db.hpp
diff --git a/repertory2/librepertory2/include/providers/provider.hpp b/repertory/librepertory/include/providers/provider.hpp
similarity index 100%
rename from repertory2/librepertory2/include/providers/provider.hpp
rename to repertory/librepertory/include/providers/provider.hpp
diff --git a/repertory2/librepertory2/include/providers/s3/s3_provider.hpp b/repertory/librepertory/include/providers/s3/s3_provider.hpp
similarity index 100%
rename from repertory2/librepertory2/include/providers/s3/s3_provider.hpp
rename to repertory/librepertory/include/providers/s3/s3_provider.hpp
diff --git a/repertory2/librepertory2/include/providers/sia/sia_provider.hpp b/repertory/librepertory/include/providers/sia/sia_provider.hpp
similarity index 100%
rename from repertory2/librepertory2/include/providers/sia/sia_provider.hpp
rename to repertory/librepertory/include/providers/sia/sia_provider.hpp
diff --git a/repertory2/librepertory2/include/rpc/client/client.hpp b/repertory/librepertory/include/rpc/client/client.hpp
similarity index 100%
rename from repertory2/librepertory2/include/rpc/client/client.hpp
rename to repertory/librepertory/include/rpc/client/client.hpp
diff --git a/repertory2/librepertory2/include/rpc/server/full_server.hpp b/repertory/librepertory/include/rpc/server/full_server.hpp
similarity index 100%
rename from repertory2/librepertory2/include/rpc/server/full_server.hpp
rename to repertory/librepertory/include/rpc/server/full_server.hpp
diff --git a/repertory2/librepertory2/include/rpc/server/server.hpp b/repertory/librepertory/include/rpc/server/server.hpp
similarity index 100%
rename from repertory2/librepertory2/include/rpc/server/server.hpp
rename to repertory/librepertory/include/rpc/server/server.hpp
diff --git a/repertory2/librepertory2/include/types/remote.hpp b/repertory/librepertory/include/types/remote.hpp
similarity index 100%
rename from repertory2/librepertory2/include/types/remote.hpp
rename to repertory/librepertory/include/types/remote.hpp
diff --git a/repertory2/librepertory2/include/types/repertory.hpp b/repertory/librepertory/include/types/repertory.hpp
similarity index 100%
rename from repertory2/librepertory2/include/types/repertory.hpp
rename to repertory/librepertory/include/types/repertory.hpp
diff --git a/repertory2/librepertory2/include/types/rpc.hpp b/repertory/librepertory/include/types/rpc.hpp
similarity index 100%
rename from repertory2/librepertory2/include/types/rpc.hpp
rename to repertory/librepertory/include/types/rpc.hpp
diff --git a/repertory2/librepertory2/include/types/s3.hpp b/repertory/librepertory/include/types/s3.hpp
similarity index 100%
rename from repertory2/librepertory2/include/types/s3.hpp
rename to repertory/librepertory/include/types/s3.hpp
diff --git a/repertory2/librepertory2/include/types/startup_exception.hpp b/repertory/librepertory/include/types/startup_exception.hpp
similarity index 100%
rename from repertory2/librepertory2/include/types/startup_exception.hpp
rename to repertory/librepertory/include/types/startup_exception.hpp
diff --git a/repertory2/librepertory2/include/utils/Base64.hpp b/repertory/librepertory/include/utils/Base64.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/Base64.hpp
rename to repertory/librepertory/include/utils/Base64.hpp
diff --git a/repertory2/librepertory2/include/utils/action_queue.hpp b/repertory/librepertory/include/utils/action_queue.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/action_queue.hpp
rename to repertory/librepertory/include/utils/action_queue.hpp
diff --git a/repertory2/librepertory2/include/utils/cli_utils.hpp b/repertory/librepertory/include/utils/cli_utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/cli_utils.hpp
rename to repertory/librepertory/include/utils/cli_utils.hpp
diff --git a/repertory2/librepertory2/include/utils/com_init_wrapper.hpp b/repertory/librepertory/include/utils/com_init_wrapper.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/com_init_wrapper.hpp
rename to repertory/librepertory/include/utils/com_init_wrapper.hpp
diff --git a/repertory2/librepertory2/include/utils/encrypting_reader.hpp b/repertory/librepertory/include/utils/encrypting_reader.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/encrypting_reader.hpp
rename to repertory/librepertory/include/utils/encrypting_reader.hpp
diff --git a/repertory2/librepertory2/include/utils/encryption.hpp b/repertory/librepertory/include/utils/encryption.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/encryption.hpp
rename to repertory/librepertory/include/utils/encryption.hpp
diff --git a/repertory2/librepertory2/include/utils/error_utils.hpp b/repertory/librepertory/include/utils/error_utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/error_utils.hpp
rename to repertory/librepertory/include/utils/error_utils.hpp
diff --git a/repertory2/librepertory2/include/utils/file_utils.hpp b/repertory/librepertory/include/utils/file_utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/file_utils.hpp
rename to repertory/librepertory/include/utils/file_utils.hpp
diff --git a/repertory2/librepertory2/include/utils/native_file.hpp b/repertory/librepertory/include/utils/native_file.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/native_file.hpp
rename to repertory/librepertory/include/utils/native_file.hpp
diff --git a/repertory2/librepertory2/include/utils/path_utils.hpp b/repertory/librepertory/include/utils/path_utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/path_utils.hpp
rename to repertory/librepertory/include/utils/path_utils.hpp
diff --git a/repertory2/librepertory2/include/utils/polling.hpp b/repertory/librepertory/include/utils/polling.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/polling.hpp
rename to repertory/librepertory/include/utils/polling.hpp
diff --git a/repertory2/librepertory2/include/utils/single_thread_service_base.hpp b/repertory/librepertory/include/utils/single_thread_service_base.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/single_thread_service_base.hpp
rename to repertory/librepertory/include/utils/single_thread_service_base.hpp
diff --git a/repertory2/librepertory2/include/utils/string_utils.hpp b/repertory/librepertory/include/utils/string_utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/string_utils.hpp
rename to repertory/librepertory/include/utils/string_utils.hpp
diff --git a/repertory2/librepertory2/include/utils/throttle.hpp b/repertory/librepertory/include/utils/throttle.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/throttle.hpp
rename to repertory/librepertory/include/utils/throttle.hpp
diff --git a/repertory2/librepertory2/include/utils/timeout.hpp b/repertory/librepertory/include/utils/timeout.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/timeout.hpp
rename to repertory/librepertory/include/utils/timeout.hpp
diff --git a/repertory2/librepertory2/include/utils/unix/unix_utils.hpp b/repertory/librepertory/include/utils/unix/unix_utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/unix/unix_utils.hpp
rename to repertory/librepertory/include/utils/unix/unix_utils.hpp
diff --git a/repertory2/librepertory2/include/utils/utils.hpp b/repertory/librepertory/include/utils/utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/utils.hpp
rename to repertory/librepertory/include/utils/utils.hpp
diff --git a/repertory2/librepertory2/include/utils/windows/windows_utils.hpp b/repertory/librepertory/include/utils/windows/windows_utils.hpp
similarity index 100%
rename from repertory2/librepertory2/include/utils/windows/windows_utils.hpp
rename to repertory/librepertory/include/utils/windows/windows_utils.hpp
diff --git a/repertory2/librepertory2/src/app_config.cpp b/repertory/librepertory/src/app_config.cpp
similarity index 100%
rename from repertory2/librepertory2/src/app_config.cpp
rename to repertory/librepertory/src/app_config.cpp
diff --git a/repertory2/librepertory2/src/comm/curl/curl_comm.cpp b/repertory/librepertory/src/comm/curl/curl_comm.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/curl/curl_comm.cpp
rename to repertory/librepertory/src/comm/curl/curl_comm.cpp
diff --git a/repertory2/librepertory2/src/comm/curl/multi_request.cpp b/repertory/librepertory/src/comm/curl/multi_request.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/curl/multi_request.cpp
rename to repertory/librepertory/src/comm/curl/multi_request.cpp
diff --git a/repertory2/librepertory2/src/comm/curl/requests/http_post.cpp b/repertory/librepertory/src/comm/curl/requests/http_post.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/curl/requests/http_post.cpp
rename to repertory/librepertory/src/comm/curl/requests/http_post.cpp
diff --git a/repertory2/librepertory2/src/comm/curl/requests/http_put_file.cpp b/repertory/librepertory/src/comm/curl/requests/http_put_file.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/curl/requests/http_put_file.cpp
rename to repertory/librepertory/src/comm/curl/requests/http_put_file.cpp
diff --git a/repertory2/librepertory2/src/comm/packet/client_pool.cpp b/repertory/librepertory/src/comm/packet/client_pool.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/packet/client_pool.cpp
rename to repertory/librepertory/src/comm/packet/client_pool.cpp
diff --git a/repertory2/librepertory2/src/comm/packet/packet.cpp b/repertory/librepertory/src/comm/packet/packet.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/packet/packet.cpp
rename to repertory/librepertory/src/comm/packet/packet.cpp
diff --git a/repertory2/librepertory2/src/comm/packet/packet_client.cpp b/repertory/librepertory/src/comm/packet/packet_client.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/packet/packet_client.cpp
rename to repertory/librepertory/src/comm/packet/packet_client.cpp
diff --git a/repertory2/librepertory2/src/comm/packet/packet_server.cpp b/repertory/librepertory/src/comm/packet/packet_server.cpp
similarity index 100%
rename from repertory2/librepertory2/src/comm/packet/packet_server.cpp
rename to repertory/librepertory/src/comm/packet/packet_server.cpp
diff --git a/repertory2/librepertory2/src/common.cpp b/repertory/librepertory/src/common.cpp
similarity index 100%
rename from repertory2/librepertory2/src/common.cpp
rename to repertory/librepertory/src/common.cpp
diff --git a/repertory2/librepertory2/src/common.cpp.in b/repertory/librepertory/src/common.cpp.in
similarity index 100%
rename from repertory2/librepertory2/src/common.cpp.in
rename to repertory/librepertory/src/common.cpp.in
diff --git a/repertory2/librepertory2/src/database/db_insert.cpp b/repertory/librepertory/src/database/db_insert.cpp
similarity index 100%
rename from repertory2/librepertory2/src/database/db_insert.cpp
rename to repertory/librepertory/src/database/db_insert.cpp
diff --git a/repertory2/librepertory2/src/database/db_select.cpp b/repertory/librepertory/src/database/db_select.cpp
similarity index 100%
rename from repertory2/librepertory2/src/database/db_select.cpp
rename to repertory/librepertory/src/database/db_select.cpp
diff --git a/repertory2/librepertory2/src/drives/directory_cache.cpp b/repertory/librepertory/src/drives/directory_cache.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/directory_cache.cpp
rename to repertory/librepertory/src/drives/directory_cache.cpp
diff --git a/repertory2/librepertory2/src/drives/directory_iterator.cpp b/repertory/librepertory/src/drives/directory_iterator.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/directory_iterator.cpp
rename to repertory/librepertory/src/drives/directory_iterator.cpp
diff --git a/repertory2/librepertory2/src/drives/eviction.cpp b/repertory/librepertory/src/drives/eviction.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/eviction.cpp
rename to repertory/librepertory/src/drives/eviction.cpp
diff --git a/repertory2/librepertory2/src/drives/fuse/fuse_base.cpp b/repertory/librepertory/src/drives/fuse/fuse_base.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/fuse/fuse_base.cpp
rename to repertory/librepertory/src/drives/fuse/fuse_base.cpp
diff --git a/repertory2/librepertory2/src/drives/fuse/fuse_drive.cpp b/repertory/librepertory/src/drives/fuse/fuse_drive.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/fuse/fuse_drive.cpp
rename to repertory/librepertory/src/drives/fuse/fuse_drive.cpp
diff --git a/repertory2/librepertory2/src/drives/fuse/fuse_drive_base.cpp b/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/fuse/fuse_drive_base.cpp
rename to repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
diff --git a/repertory2/librepertory2/src/drives/fuse/remotefuse/remote_client.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_client.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/fuse/remotefuse/remote_client.cpp
rename to repertory/librepertory/src/drives/fuse/remotefuse/remote_client.cpp
diff --git a/repertory2/librepertory2/src/drives/fuse/remotefuse/remote_fuse_drive.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_fuse_drive.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/fuse/remotefuse/remote_fuse_drive.cpp
rename to repertory/librepertory/src/drives/fuse/remotefuse/remote_fuse_drive.cpp
diff --git a/repertory2/librepertory2/src/drives/fuse/remotefuse/remote_server.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/fuse/remotefuse/remote_server.cpp
rename to repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
diff --git a/repertory2/librepertory2/src/drives/remote/remote_open_file_table.cpp b/repertory/librepertory/src/drives/remote/remote_open_file_table.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/remote/remote_open_file_table.cpp
rename to repertory/librepertory/src/drives/remote/remote_open_file_table.cpp
diff --git a/repertory2/librepertory2/src/drives/winfsp/remotewinfsp/remote_client.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_client.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/winfsp/remotewinfsp/remote_client.cpp
rename to repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_client.cpp
diff --git a/repertory2/librepertory2/src/drives/winfsp/remotewinfsp/remote_server.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/winfsp/remotewinfsp/remote_server.cpp
rename to repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
diff --git a/repertory2/librepertory2/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
rename to repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
diff --git a/repertory2/librepertory2/src/drives/winfsp/winfsp_drive.cpp b/repertory/librepertory/src/drives/winfsp/winfsp_drive.cpp
similarity index 100%
rename from repertory2/librepertory2/src/drives/winfsp/winfsp_drive.cpp
rename to repertory/librepertory/src/drives/winfsp/winfsp_drive.cpp
diff --git a/repertory2/librepertory2/src/events/consumers/logging_consumer.cpp b/repertory/librepertory/src/events/consumers/logging_consumer.cpp
similarity index 100%
rename from repertory2/librepertory2/src/events/consumers/logging_consumer.cpp
rename to repertory/librepertory/src/events/consumers/logging_consumer.cpp
diff --git a/repertory2/librepertory2/src/events/event.cpp b/repertory/librepertory/src/events/event.cpp
similarity index 100%
rename from repertory2/librepertory2/src/events/event.cpp
rename to repertory/librepertory/src/events/event.cpp
diff --git a/repertory2/librepertory2/src/events/t_event_system.cpp b/repertory/librepertory/src/events/t_event_system.cpp
similarity index 100%
rename from repertory2/librepertory2/src/events/t_event_system.cpp
rename to repertory/librepertory/src/events/t_event_system.cpp
diff --git a/repertory2/librepertory2/src/file_manager/file_manager.cpp b/repertory/librepertory/src/file_manager/file_manager.cpp
similarity index 100%
rename from repertory2/librepertory2/src/file_manager/file_manager.cpp
rename to repertory/librepertory/src/file_manager/file_manager.cpp
diff --git a/repertory2/librepertory2/src/file_manager/file_manager_open_file.cpp b/repertory/librepertory/src/file_manager/file_manager_open_file.cpp
similarity index 100%
rename from repertory2/librepertory2/src/file_manager/file_manager_open_file.cpp
rename to repertory/librepertory/src/file_manager/file_manager_open_file.cpp
diff --git a/repertory2/librepertory2/src/file_manager/file_manager_open_file_base.cpp b/repertory/librepertory/src/file_manager/file_manager_open_file_base.cpp
similarity index 100%
rename from repertory2/librepertory2/src/file_manager/file_manager_open_file_base.cpp
rename to repertory/librepertory/src/file_manager/file_manager_open_file_base.cpp
diff --git a/repertory2/librepertory2/src/file_manager/file_manager_open_file_base_download.cpp b/repertory/librepertory/src/file_manager/file_manager_open_file_base_download.cpp
similarity index 100%
rename from repertory2/librepertory2/src/file_manager/file_manager_open_file_base_download.cpp
rename to repertory/librepertory/src/file_manager/file_manager_open_file_base_download.cpp
diff --git a/repertory2/librepertory2/src/file_manager/file_manager_open_file_base_io_item.cpp b/repertory/librepertory/src/file_manager/file_manager_open_file_base_io_item.cpp
similarity index 100%
rename from repertory2/librepertory2/src/file_manager/file_manager_open_file_base_io_item.cpp
rename to repertory/librepertory/src/file_manager/file_manager_open_file_base_io_item.cpp
diff --git a/repertory2/librepertory2/src/file_manager/file_manager_ring_buffer_open_file.cpp b/repertory/librepertory/src/file_manager/file_manager_ring_buffer_open_file.cpp
similarity index 100%
rename from repertory2/librepertory2/src/file_manager/file_manager_ring_buffer_open_file.cpp
rename to repertory/librepertory/src/file_manager/file_manager_ring_buffer_open_file.cpp
diff --git a/repertory2/librepertory2/src/file_manager/file_manager_upload.cpp b/repertory/librepertory/src/file_manager/file_manager_upload.cpp
similarity index 100%
rename from repertory2/librepertory2/src/file_manager/file_manager_upload.cpp
rename to repertory/librepertory/src/file_manager/file_manager_upload.cpp
diff --git a/repertory2/librepertory2/src/initialize.cpp b/repertory/librepertory/src/initialize.cpp
similarity index 100%
rename from repertory2/librepertory2/src/initialize.cpp
rename to repertory/librepertory/src/initialize.cpp
diff --git a/repertory2/librepertory2/src/platform/unix_platform.cpp b/repertory/librepertory/src/platform/unix_platform.cpp
similarity index 96%
rename from repertory2/librepertory2/src/platform/unix_platform.cpp
rename to repertory/librepertory/src/platform/unix_platform.cpp
index d01823af..3b05d62d 100644
--- a/repertory2/librepertory2/src/platform/unix_platform.cpp
+++ b/repertory/librepertory/src/platform/unix_platform.cpp
@@ -35,7 +35,7 @@ namespace repertory {
 lock_data::lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
     : pt_(pt),
       unique_id_(std::move(unique_id)),
-      mutex_id_("repertory2_" + app_config::get_provider_name(pt) + "_" +
+      mutex_id_("repertory_" + app_config::get_provider_name(pt) + "_" +
                 unique_id_) {
   lock_fd_ = open(get_lock_file().c_str(), O_CREAT | O_RDWR, S_IWUSR | S_IRUSR);
 }
diff --git a/repertory2/librepertory2/src/platform/win32_platform.cpp b/repertory/librepertory/src/platform/win32_platform.cpp
similarity index 100%
rename from repertory2/librepertory2/src/platform/win32_platform.cpp
rename to repertory/librepertory/src/platform/win32_platform.cpp
diff --git a/repertory2/librepertory2/src/providers/base_provider.cpp b/repertory/librepertory/src/providers/base_provider.cpp
similarity index 100%
rename from repertory2/librepertory2/src/providers/base_provider.cpp
rename to repertory/librepertory/src/providers/base_provider.cpp
diff --git a/repertory2/librepertory2/src/providers/encrypt/encrypt_provider.cpp b/repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp
similarity index 100%
rename from repertory2/librepertory2/src/providers/encrypt/encrypt_provider.cpp
rename to repertory/librepertory/src/providers/encrypt/encrypt_provider.cpp
diff --git a/repertory2/librepertory2/src/providers/meta_db.cpp b/repertory/librepertory/src/providers/meta_db.cpp
similarity index 100%
rename from repertory2/librepertory2/src/providers/meta_db.cpp
rename to repertory/librepertory/src/providers/meta_db.cpp
diff --git a/repertory2/librepertory2/src/providers/provider.cpp b/repertory/librepertory/src/providers/provider.cpp
similarity index 100%
rename from repertory2/librepertory2/src/providers/provider.cpp
rename to repertory/librepertory/src/providers/provider.cpp
diff --git a/repertory2/librepertory2/src/providers/s3/s3_provider.cpp b/repertory/librepertory/src/providers/s3/s3_provider.cpp
similarity index 100%
rename from repertory2/librepertory2/src/providers/s3/s3_provider.cpp
rename to repertory/librepertory/src/providers/s3/s3_provider.cpp
diff --git a/repertory2/librepertory2/src/providers/sia/sia_provider.cpp b/repertory/librepertory/src/providers/sia/sia_provider.cpp
similarity index 100%
rename from repertory2/librepertory2/src/providers/sia/sia_provider.cpp
rename to repertory/librepertory/src/providers/sia/sia_provider.cpp
diff --git a/repertory2/librepertory2/src/rpc/client/client.cpp b/repertory/librepertory/src/rpc/client/client.cpp
similarity index 100%
rename from repertory2/librepertory2/src/rpc/client/client.cpp
rename to repertory/librepertory/src/rpc/client/client.cpp
diff --git a/repertory2/librepertory2/src/rpc/server/full_server.cpp b/repertory/librepertory/src/rpc/server/full_server.cpp
similarity index 100%
rename from repertory2/librepertory2/src/rpc/server/full_server.cpp
rename to repertory/librepertory/src/rpc/server/full_server.cpp
diff --git a/repertory2/librepertory2/src/rpc/server/server.cpp b/repertory/librepertory/src/rpc/server/server.cpp
similarity index 100%
rename from repertory2/librepertory2/src/rpc/server/server.cpp
rename to repertory/librepertory/src/rpc/server/server.cpp
diff --git a/repertory2/librepertory2/src/types/remote.cpp b/repertory/librepertory/src/types/remote.cpp
similarity index 100%
rename from repertory2/librepertory2/src/types/remote.cpp
rename to repertory/librepertory/src/types/remote.cpp
diff --git a/repertory2/librepertory2/src/types/repertory.cpp b/repertory/librepertory/src/types/repertory.cpp
similarity index 100%
rename from repertory2/librepertory2/src/types/repertory.cpp
rename to repertory/librepertory/src/types/repertory.cpp
diff --git a/repertory2/librepertory2/src/utils/action_queue.cpp b/repertory/librepertory/src/utils/action_queue.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/action_queue.cpp
rename to repertory/librepertory/src/utils/action_queue.cpp
diff --git a/repertory2/librepertory2/src/utils/cli_utils.cpp b/repertory/librepertory/src/utils/cli_utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/cli_utils.cpp
rename to repertory/librepertory/src/utils/cli_utils.cpp
diff --git a/repertory2/librepertory2/src/utils/encrypting_reader.cpp b/repertory/librepertory/src/utils/encrypting_reader.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/encrypting_reader.cpp
rename to repertory/librepertory/src/utils/encrypting_reader.cpp
diff --git a/repertory2/librepertory2/src/utils/encryption.cpp b/repertory/librepertory/src/utils/encryption.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/encryption.cpp
rename to repertory/librepertory/src/utils/encryption.cpp
diff --git a/repertory2/librepertory2/src/utils/error_utils.cpp b/repertory/librepertory/src/utils/error_utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/error_utils.cpp
rename to repertory/librepertory/src/utils/error_utils.cpp
diff --git a/repertory2/librepertory2/src/utils/file_utils.cpp b/repertory/librepertory/src/utils/file_utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/file_utils.cpp
rename to repertory/librepertory/src/utils/file_utils.cpp
diff --git a/repertory2/librepertory2/src/utils/native_file.cpp b/repertory/librepertory/src/utils/native_file.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/native_file.cpp
rename to repertory/librepertory/src/utils/native_file.cpp
diff --git a/repertory2/librepertory2/src/utils/path_utils.cpp b/repertory/librepertory/src/utils/path_utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/path_utils.cpp
rename to repertory/librepertory/src/utils/path_utils.cpp
diff --git a/repertory2/librepertory2/src/utils/polling.cpp b/repertory/librepertory/src/utils/polling.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/polling.cpp
rename to repertory/librepertory/src/utils/polling.cpp
diff --git a/repertory2/librepertory2/src/utils/single_thread_service_base.cpp b/repertory/librepertory/src/utils/single_thread_service_base.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/single_thread_service_base.cpp
rename to repertory/librepertory/src/utils/single_thread_service_base.cpp
diff --git a/repertory2/librepertory2/src/utils/string_utils.cpp b/repertory/librepertory/src/utils/string_utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/string_utils.cpp
rename to repertory/librepertory/src/utils/string_utils.cpp
diff --git a/repertory2/librepertory2/src/utils/throttle.cpp b/repertory/librepertory/src/utils/throttle.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/throttle.cpp
rename to repertory/librepertory/src/utils/throttle.cpp
diff --git a/repertory2/librepertory2/src/utils/timeout.cpp b/repertory/librepertory/src/utils/timeout.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/timeout.cpp
rename to repertory/librepertory/src/utils/timeout.cpp
diff --git a/repertory2/librepertory2/src/utils/unix/unix_utils.cpp b/repertory/librepertory/src/utils/unix/unix_utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/unix/unix_utils.cpp
rename to repertory/librepertory/src/utils/unix/unix_utils.cpp
diff --git a/repertory2/librepertory2/src/utils/utils.cpp b/repertory/librepertory/src/utils/utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/utils.cpp
rename to repertory/librepertory/src/utils/utils.cpp
diff --git a/repertory2/librepertory2/src/utils/windows/windows_utils.cpp b/repertory/librepertory/src/utils/windows/windows_utils.cpp
similarity index 100%
rename from repertory2/librepertory2/src/utils/windows/windows_utils.cpp
rename to repertory/librepertory/src/utils/windows/windows_utils.cpp
diff --git a/repertory2/librepertory2/src/version.rc b/repertory/librepertory/src/version.rc
similarity index 100%
rename from repertory2/librepertory2/src/version.rc
rename to repertory/librepertory/src/version.rc
diff --git a/repertory2/repertory2/include/cli/actions.hpp b/repertory/repertory/include/cli/actions.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/actions.hpp
rename to repertory/repertory/include/cli/actions.hpp
diff --git a/repertory2/repertory2/include/cli/check_version.hpp b/repertory/repertory/include/cli/check_version.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/check_version.hpp
rename to repertory/repertory/include/cli/check_version.hpp
diff --git a/repertory2/repertory2/include/cli/display_config.hpp b/repertory/repertory/include/cli/display_config.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/display_config.hpp
rename to repertory/repertory/include/cli/display_config.hpp
diff --git a/repertory2/repertory2/include/cli/drive_information.hpp b/repertory/repertory/include/cli/drive_information.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/drive_information.hpp
rename to repertory/repertory/include/cli/drive_information.hpp
diff --git a/repertory2/repertory2/include/cli/get.hpp b/repertory/repertory/include/cli/get.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/get.hpp
rename to repertory/repertory/include/cli/get.hpp
diff --git a/repertory2/repertory2/include/cli/get_directory_items.hpp b/repertory/repertory/include/cli/get_directory_items.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/get_directory_items.hpp
rename to repertory/repertory/include/cli/get_directory_items.hpp
diff --git a/repertory2/repertory2/include/cli/get_pinned_files.hpp b/repertory/repertory/include/cli/get_pinned_files.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/get_pinned_files.hpp
rename to repertory/repertory/include/cli/get_pinned_files.hpp
diff --git a/repertory2/repertory2/include/cli/help.hpp b/repertory/repertory/include/cli/help.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/help.hpp
rename to repertory/repertory/include/cli/help.hpp
diff --git a/repertory2/repertory2/include/cli/mount.hpp b/repertory/repertory/include/cli/mount.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/mount.hpp
rename to repertory/repertory/include/cli/mount.hpp
diff --git a/repertory2/repertory2/include/cli/open_files.hpp b/repertory/repertory/include/cli/open_files.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/open_files.hpp
rename to repertory/repertory/include/cli/open_files.hpp
diff --git a/repertory2/repertory2/include/cli/pin_file.hpp b/repertory/repertory/include/cli/pin_file.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/pin_file.hpp
rename to repertory/repertory/include/cli/pin_file.hpp
diff --git a/repertory2/repertory2/include/cli/pinned_status.hpp b/repertory/repertory/include/cli/pinned_status.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/pinned_status.hpp
rename to repertory/repertory/include/cli/pinned_status.hpp
diff --git a/repertory2/repertory2/include/cli/set.hpp b/repertory/repertory/include/cli/set.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/set.hpp
rename to repertory/repertory/include/cli/set.hpp
diff --git a/repertory2/repertory2/include/cli/status.hpp b/repertory/repertory/include/cli/status.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/status.hpp
rename to repertory/repertory/include/cli/status.hpp
diff --git a/repertory2/repertory2/include/cli/unmount.hpp b/repertory/repertory/include/cli/unmount.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/unmount.hpp
rename to repertory/repertory/include/cli/unmount.hpp
diff --git a/repertory2/repertory2/include/cli/unpin_file.hpp b/repertory/repertory/include/cli/unpin_file.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/unpin_file.hpp
rename to repertory/repertory/include/cli/unpin_file.hpp
diff --git a/repertory2/repertory2/include/cli/version.hpp b/repertory/repertory/include/cli/version.hpp
similarity index 100%
rename from repertory2/repertory2/include/cli/version.hpp
rename to repertory/repertory/include/cli/version.hpp
diff --git a/repertory2/repertory2/main.cpp b/repertory/repertory/main.cpp
similarity index 100%
rename from repertory2/repertory2/main.cpp
rename to repertory/repertory/main.cpp
diff --git a/repertory2/repertory2_test/encrypt/sub10/moose.txt b/repertory/repertory_test/encrypt/sub10/moose.txt
similarity index 100%
rename from repertory2/repertory2_test/encrypt/sub10/moose.txt
rename to repertory/repertory_test/encrypt/sub10/moose.txt
diff --git a/repertory2/repertory2_test/encrypt/test.txt b/repertory/repertory_test/encrypt/test.txt
similarity index 100%
rename from repertory2/repertory2_test/encrypt/test.txt
rename to repertory/repertory_test/encrypt/test.txt
diff --git a/repertory2/repertory2_test/include/fixtures/winfsp_fixture.hpp b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/fixtures/winfsp_fixture.hpp
rename to repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
diff --git a/repertory2/repertory2_test/include/mocks/mock_fuse_drive.hpp b/repertory/repertory_test/include/mocks/mock_fuse_drive.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/mocks/mock_fuse_drive.hpp
rename to repertory/repertory_test/include/mocks/mock_fuse_drive.hpp
diff --git a/repertory2/repertory2_test/include/mocks/mock_open_file.hpp b/repertory/repertory_test/include/mocks/mock_open_file.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/mocks/mock_open_file.hpp
rename to repertory/repertory_test/include/mocks/mock_open_file.hpp
diff --git a/repertory2/repertory2_test/include/mocks/mock_provider.hpp b/repertory/repertory_test/include/mocks/mock_provider.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/mocks/mock_provider.hpp
rename to repertory/repertory_test/include/mocks/mock_provider.hpp
diff --git a/repertory2/repertory2_test/include/mocks/mock_upload_manager.hpp b/repertory/repertory_test/include/mocks/mock_upload_manager.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/mocks/mock_upload_manager.hpp
rename to repertory/repertory_test/include/mocks/mock_upload_manager.hpp
diff --git a/repertory2/repertory2_test/include/mocks/mock_winfsp_drive.hpp b/repertory/repertory_test/include/mocks/mock_winfsp_drive.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/mocks/mock_winfsp_drive.hpp
rename to repertory/repertory_test/include/mocks/mock_winfsp_drive.hpp
diff --git a/repertory2/repertory2_test/include/test_common.hpp b/repertory/repertory_test/include/test_common.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/test_common.hpp
rename to repertory/repertory_test/include/test_common.hpp
diff --git a/repertory2/repertory2_test/include/utils/event_capture.hpp b/repertory/repertory_test/include/utils/event_capture.hpp
similarity index 100%
rename from repertory2/repertory2_test/include/utils/event_capture.hpp
rename to repertory/repertory_test/include/utils/event_capture.hpp
diff --git a/repertory2/repertory2_test/main.cpp b/repertory/repertory_test/main.cpp
similarity index 100%
rename from repertory2/repertory2_test/main.cpp
rename to repertory/repertory_test/main.cpp
diff --git a/repertory2/repertory2_test/src/config_test.cpp b/repertory/repertory_test/src/config_test.cpp
similarity index 97%
rename from repertory2/repertory2_test/src/config_test.cpp
rename to repertory/repertory_test/src/config_test.cpp
index b9e9310e..64d53737 100644
--- a/repertory2/repertory2_test/src/config_test.cpp
+++ b/repertory/repertory_test/src/config_test.cpp
@@ -587,7 +587,7 @@ TEST_F(config_test, default_data_directory) {
       utils::get_environment_variable("HOME"), {"Library/Application Support"});
 #endif
   auto expected_directory =
-      utils::path::combine(local_app_data, {"/repertory2/sia"});
+      utils::path::combine(local_app_data, {"/repertory/sia"});
   EXPECT_STREQ(expected_directory.c_str(), data_directory[0].c_str());
 }
 
diff --git a/repertory2/repertory2_test/src/curl_comm_test.cpp b/repertory/repertory_test/src/curl_comm_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/curl_comm_test.cpp
rename to repertory/repertory_test/src/curl_comm_test.cpp
diff --git a/repertory2/repertory2_test/src/database_test.cpp b/repertory/repertory_test/src/database_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/database_test.cpp
rename to repertory/repertory_test/src/database_test.cpp
diff --git a/repertory2/repertory2_test/src/encrypt_provider_test.cpp b/repertory/repertory_test/src/encrypt_provider_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/encrypt_provider_test.cpp
rename to repertory/repertory_test/src/encrypt_provider_test.cpp
diff --git a/repertory2/repertory2_test/src/encrypting_reader_test.cpp b/repertory/repertory_test/src/encrypting_reader_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/encrypting_reader_test.cpp
rename to repertory/repertory_test/src/encrypting_reader_test.cpp
diff --git a/repertory2/repertory2_test/src/encryption_test.cpp b/repertory/repertory_test/src/encryption_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/encryption_test.cpp
rename to repertory/repertory_test/src/encryption_test.cpp
diff --git a/repertory2/repertory2_test/src/file_manager_open_file_test.cpp b/repertory/repertory_test/src/file_manager_open_file_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/file_manager_open_file_test.cpp
rename to repertory/repertory_test/src/file_manager_open_file_test.cpp
diff --git a/repertory2/repertory2_test/src/file_manager_ring_buffer_open_file_test.cpp b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/file_manager_ring_buffer_open_file_test.cpp
rename to repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
diff --git a/repertory2/repertory2_test/src/file_manager_test.cpp b/repertory/repertory_test/src/file_manager_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/file_manager_test.cpp
rename to repertory/repertory_test/src/file_manager_test.cpp
diff --git a/repertory2/repertory2_test/src/file_manager_upload_test.cpp b/repertory/repertory_test/src/file_manager_upload_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/file_manager_upload_test.cpp
rename to repertory/repertory_test/src/file_manager_upload_test.cpp
diff --git a/repertory2/repertory2_test/src/fuse_drive_test.cpp b/repertory/repertory_test/src/fuse_drive_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/fuse_drive_test.cpp
rename to repertory/repertory_test/src/fuse_drive_test.cpp
diff --git a/repertory2/repertory2_test/src/lock_data_test.cpp b/repertory/repertory_test/src/lock_data_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/lock_data_test.cpp
rename to repertory/repertory_test/src/lock_data_test.cpp
diff --git a/repertory2/repertory2_test/src/packet_test.cpp b/repertory/repertory_test/src/packet_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/packet_test.cpp
rename to repertory/repertory_test/src/packet_test.cpp
diff --git a/repertory2/repertory2_test/src/path_utils_test.cpp b/repertory/repertory_test/src/path_utils_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/path_utils_test.cpp
rename to repertory/repertory_test/src/path_utils_test.cpp
diff --git a/repertory2/repertory2_test/src/providers_test.cpp b/repertory/repertory_test/src/providers_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/providers_test.cpp
rename to repertory/repertory_test/src/providers_test.cpp
diff --git a/repertory2/repertory2_test/src/remote_fuse_test.cpp b/repertory/repertory_test/src/remote_fuse_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/remote_fuse_test.cpp
rename to repertory/repertory_test/src/remote_fuse_test.cpp
diff --git a/repertory2/repertory2_test/src/remote_winfsp_test.cpp b/repertory/repertory_test/src/remote_winfsp_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/remote_winfsp_test.cpp
rename to repertory/repertory_test/src/remote_winfsp_test.cpp
diff --git a/repertory2/repertory2_test/src/sia_provider_test.cpp b/repertory/repertory_test/src/sia_provider_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/sia_provider_test.cpp
rename to repertory/repertory_test/src/sia_provider_test.cpp
diff --git a/repertory2/repertory2_test/src/string_utils_test.cpp b/repertory/repertory_test/src/string_utils_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/string_utils_test.cpp
rename to repertory/repertory_test/src/string_utils_test.cpp
diff --git a/repertory2/repertory2_test/src/test_common.cpp b/repertory/repertory_test/src/test_common.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/test_common.cpp
rename to repertory/repertory_test/src/test_common.cpp
diff --git a/repertory2/repertory2_test/src/utils_test.cpp b/repertory/repertory_test/src/utils_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/utils_test.cpp
rename to repertory/repertory_test/src/utils_test.cpp
diff --git a/repertory2/repertory2_test/src/version_test.cpp b/repertory/repertory_test/src/version_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/version_test.cpp
rename to repertory/repertory_test/src/version_test.cpp
diff --git a/repertory2/repertory2_test/src/winfsp_test.cpp b/repertory/repertory_test/src/winfsp_test.cpp
similarity index 100%
rename from repertory2/repertory2_test/src/winfsp_test.cpp
rename to repertory/repertory_test/src/winfsp_test.cpp