diff --git a/repertory/librepertory/src/file_manager/file_manager_open_file.cpp b/repertory/librepertory/src/file_manager/file_manager_open_file.cpp
index 5b1f568a..b0360510 100644
--- a/repertory/librepertory/src/file_manager/file_manager_open_file.cpp
+++ b/repertory/librepertory/src/file_manager/file_manager_open_file.cpp
@@ -292,7 +292,7 @@ auto file_manager::open_file::native_operation(
   }
 
   {
-    auto file_size = nf_->size();
+    auto file_size = nf_->size().value_or(0U);
     if (file_size != new_file_size) {
       utils::error::raise_api_path_error(
           function_name, get_api_path(), api_error::file_size_mismatch,
diff --git a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
index 9bbfc9ce..0849a227 100644
--- a/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/fuse_fixture.hpp
@@ -65,7 +65,7 @@ protected:
             std::to_string(static_cast<std::uint8_t>(provider_t::type)),
         });
 
-    ASSERT_TRUE(utils::file::remove_directory(test_directory, true));
+    ASSERT_TRUE(utils::file::directory(test_directory).remove_recursively());
 
     mount_location = utils::path::combine(test_directory, {"mount"});
     ASSERT_TRUE(utils::file::directory(mount_location).create_directory());
@@ -142,7 +142,7 @@ protected:
     std::filesystem::current_path(current_directory);
 
     [[maybe_unused]] auto ret =
-        utils::file::remove_directory(test_directory, true);
+        utils::file::directory(test_directory).remove_recursively();
   }
 
 public:
diff --git a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
index a50907fe..e530ea15 100644
--- a/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
+++ b/repertory/repertory_test/include/fixtures/winfsp_fixture.hpp
@@ -49,11 +49,11 @@ protected:
   void SetUp() override {
     if (PROVIDER_INDEX != 0) {
       if (PROVIDER_INDEX == 1) {
-        EXPECT_TRUE(utils::file::remove_directory(
-            utils::path::combine(
-                test::get_test_output_dir(),
-                {"winfsp_test" + std::to_string(PROVIDER_INDEX)}),
-            true));
+        EXPECT_TRUE(utils::file::directory(
+                        utils::path::combine(
+                            test::get_test_output_dir(),
+                            {"winfsp_test" + std::to_string(PROVIDER_INDEX)}))
+                        .remove_recursively());
 
         app_config src_cfg(
             provider_type::s3,
@@ -97,11 +97,11 @@ protected:
       }
 
       if (PROVIDER_INDEX == 2) {
-        EXPECT_TRUE(utils::file::remove_directory(
-            utils::path::combine(
-                test::get_test_output_dir(),
-                {"winfsp_test" + std::to_string(PROVIDER_INDEX)}),
-            true));
+        EXPECT_TRUE(utils::file::directory(
+                        utils::path::combine(
+                            test::get_test_output_dir(),
+                            {"winfsp_test" + std::to_string(PROVIDER_INDEX)}))
+                        .remove_recursively());
 
         app_config src_cfg(
             provider_type::sia,
@@ -149,11 +149,11 @@ protected:
       config.reset();
 
       event_system::instance().stop();
-      EXPECT_TRUE(utils::file::remove_directory(
-          utils::path::combine(
-              test::get_test_output_dir(),
-              {"winfsp_test" + std::to_string(PROVIDER_INDEX)}),
-          true));
+      EXPECT_TRUE(utils::file::directory(
+                      utils::path::combine(
+                          test::get_test_output_dir(),
+                          {"winfsp_test" + std::to_string(PROVIDER_INDEX)}))
+                      .remove_recursively());
     }
   }
 };
diff --git a/repertory/repertory_test/src/config_test.cpp b/repertory/repertory_test/src/config_test.cpp
index 8d5dd1d0..00ba67f9 100644
--- a/repertory/repertory_test/src/config_test.cpp
+++ b/repertory/repertory_test/src/config_test.cpp
@@ -40,15 +40,17 @@ public:
 
   void SetUp() override {
     event_system::instance().start();
-    ASSERT_TRUE(utils::file::remove_directory(
-        utils::path::combine(test::get_test_output_dir(), {"config_test"}),
-        true));
+    ASSERT_TRUE(
+        utils::file::directory(
+            utils::path::combine(test::get_test_output_dir(), {"config_test"}))
+            .remove_recursively());
   }
 
   void TearDown() override {
-    ASSERT_TRUE(utils::file::remove_directory(
-        utils::path::combine(test::get_test_output_dir(), {"config_test"}),
-        true));
+    ASSERT_TRUE(
+        utils::file::directory(
+            utils::path::combine(test::get_test_output_dir(), {"config_test"}))
+            .remove_recursively());
     event_system::instance().stop();
   }
 };
diff --git a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
index 19427ce2..f7bf2d89 100644
--- a/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
+++ b/repertory/repertory_test/src/file_manager_ring_buffer_open_file_test.cpp
@@ -61,7 +61,7 @@ TEST(ring_buffer_open_file, can_forward_to_last_chunk) {
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file,
@@ -93,7 +93,7 @@ TEST(ring_buffer_open_file,
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, can_forward_after_last_chunk) {
@@ -125,7 +125,7 @@ TEST(ring_buffer_open_file, can_forward_after_last_chunk) {
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, can_forward_and_rollover_after_last_chunk) {
@@ -153,7 +153,7 @@ TEST(ring_buffer_open_file, can_forward_and_rollover_after_last_chunk) {
     EXPECT_EQ(std::size_t(28u), rb.get_last_chunk());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, can_reverse_to_first_chunk) {
@@ -184,7 +184,7 @@ TEST(ring_buffer_open_file, can_reverse_to_first_chunk) {
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file,
@@ -216,7 +216,7 @@ TEST(ring_buffer_open_file,
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, can_reverse_before_first_chunk) {
@@ -248,7 +248,7 @@ TEST(ring_buffer_open_file, can_reverse_before_first_chunk) {
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, can_reverse_and_rollover_before_first_chunk) {
@@ -284,7 +284,7 @@ TEST(ring_buffer_open_file, can_reverse_and_rollover_before_first_chunk) {
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, can_reverse_full_ring) {
@@ -316,7 +316,7 @@ TEST(ring_buffer_open_file, can_reverse_full_ring) {
     }
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, read_full_file) {
@@ -375,7 +375,7 @@ TEST(ring_buffer_open_file, read_full_file) {
                  utils::file::generate_sha256(dest_path).c_str());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, read_full_file_in_reverse) {
@@ -434,7 +434,7 @@ TEST(ring_buffer_open_file, read_full_file_in_reverse) {
                  utils::file::generate_sha256(dest_path).c_str());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, read_full_file_in_partial_chunks) {
@@ -494,7 +494,7 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks) {
                  utils::file::generate_sha256(dest_path).c_str());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 
 TEST(ring_buffer_open_file, read_full_file_in_partial_chunks_in_reverse) {
@@ -559,6 +559,6 @@ TEST(ring_buffer_open_file, read_full_file_in_partial_chunks_in_reverse) {
                  utils::file::generate_sha256(dest_path).c_str());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(ring_buffer_dir, true));
+  EXPECT_TRUE(utils::file::directory(ring_buffer_dir).remove_recursively());
 }
 } // namespace repertory
diff --git a/repertory/repertory_test/src/file_manager_test.cpp b/repertory/repertory_test/src/file_manager_test.cpp
index 5e59a49d..e5754fd2 100644
--- a/repertory/repertory_test/src/file_manager_test.cpp
+++ b/repertory/repertory_test/src/file_manager_test.cpp
@@ -201,7 +201,7 @@ TEST(file_manager, can_create_and_close_file) {
 
   polling::instance().stop();
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, can_open_and_close_file) {
@@ -317,7 +317,7 @@ TEST(file_manager, can_open_and_close_file) {
 
   polling::instance().stop();
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, can_open_and_close_multiple_handles_for_same_file) {
@@ -390,7 +390,7 @@ TEST(file_manager, can_open_and_close_multiple_handles_for_same_file) {
 
   polling::instance().stop();
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, download_is_stored_after_write_if_partially_downloaded) {
@@ -543,7 +543,7 @@ TEST(file_manager, download_is_stored_after_write_if_partially_downloaded) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, upload_occurs_after_write_if_fully_downloaded) {
@@ -660,11 +660,11 @@ TEST(file_manager, upload_occurs_after_write_if_fully_downloaded) {
 
   polling::instance().stop();
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, can_evict_file) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
   {
     console_consumer c;
     event_system::instance().start();
@@ -765,11 +765,11 @@ TEST(file_manager, can_evict_file) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_file_is_pinned) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
   {
     app_config cfg(provider_type::sia, file_manager_dir);
     cfg.set_enable_chunk_downloader_timeout(false);
@@ -791,11 +791,11 @@ TEST(file_manager, evict_file_fails_if_file_is_pinned) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_provider_is_direct_only) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -807,11 +807,11 @@ TEST(file_manager, evict_file_fails_if_provider_is_direct_only) {
     EXPECT_FALSE(fm.evict_file("/test.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_file_is_open) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -857,12 +857,12 @@ TEST(file_manager, evict_file_fails_if_file_is_open) {
     fm.close(handle);
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager,
      evict_file_fails_if_unable_to_get_source_path_from_item_meta) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -892,11 +892,11 @@ TEST(file_manager,
     EXPECT_FALSE(fm.evict_file("/test_open.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_source_path_is_empty) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -926,11 +926,11 @@ TEST(file_manager, evict_file_fails_if_source_path_is_empty) {
     EXPECT_FALSE(fm.evict_file("/test_open.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_file_is_uploading) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
   {
     console_consumer c;
     event_system::instance().start();
@@ -1022,11 +1022,11 @@ TEST(file_manager, evict_file_fails_if_file_is_uploading) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_file_is_in_upload_queue) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1047,11 +1047,11 @@ TEST(file_manager, evict_file_fails_if_file_is_in_upload_queue) {
     EXPECT_FALSE(fm.evict_file("/test_evict.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_file_is_modified) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1093,11 +1093,11 @@ TEST(file_manager, evict_file_fails_if_file_is_modified) {
     EXPECT_FALSE(fm.evict_file("/test_evict.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, evict_file_fails_if_file_is_not_complete) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1141,11 +1141,11 @@ TEST(file_manager, evict_file_fails_if_file_is_not_complete) {
     EXPECT_FALSE(fm.evict_file("/test_evict.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, can_get_directory_items) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1175,11 +1175,11 @@ TEST(file_manager, can_get_directory_items) {
     EXPECT_EQ(std::size_t(2U), list.size());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, file_is_not_opened_if_provider_create_file_fails) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1211,11 +1211,11 @@ TEST(file_manager, file_is_not_opened_if_provider_create_file_fails) {
     EXPECT_EQ(std::size_t(0U), fm.get_open_file_count());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, create_fails_if_provider_create_is_unsuccessful) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1242,12 +1242,12 @@ TEST(file_manager, create_fails_if_provider_create_is_unsuccessful) {
     EXPECT_EQ(std::size_t(0U), fm.get_open_file_count());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, get_open_file_fails_if_file_is_not_open) {
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1266,12 +1266,12 @@ TEST(file_manager, get_open_file_fails_if_file_is_not_open) {
     EXPECT_FALSE(f);
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager,
      get_open_file_promotes_non_writeable_file_if_writeable_is_specified) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1351,11 +1351,11 @@ TEST(file_manager,
     EXPECT_EQ(std::size_t(1U), fm.get_open_file_count());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, open_file_fails_if_file_is_not_found) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1376,11 +1376,11 @@ TEST(file_manager, open_file_fails_if_file_is_not_found) {
     EXPECT_EQ(std::size_t(0U), fm.get_open_file_count());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, open_file_fails_if_provider_get_filesystem_item_fails) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1420,11 +1420,11 @@ TEST(file_manager, open_file_fails_if_provider_get_filesystem_item_fails) {
     EXPECT_EQ(std::size_t(0U), fm.get_open_file_count());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, open_file_fails_if_provider_set_item_meta_fails) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1471,11 +1471,11 @@ TEST(file_manager, open_file_fails_if_provider_set_item_meta_fails) {
     EXPECT_EQ(std::size_t(0U), fm.get_open_file_count());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, open_file_creates_source_path_if_empty) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1534,11 +1534,11 @@ TEST(file_manager, open_file_creates_source_path_if_empty) {
     EXPECT_EQ(std::size_t(1U), fm.get_open_file_count());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, open_file_first_file_handle_is_not_zero) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1582,11 +1582,11 @@ TEST(file_manager, open_file_first_file_handle_is_not_zero) {
     EXPECT_GT(handle, std::uint64_t(0U));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, can_remove_file) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1623,11 +1623,11 @@ TEST(file_manager, can_remove_file) {
     EXPECT_FALSE(utils::file::file("./test_remove.txt").exists());
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, can_queue_and_remove_upload) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   console_consumer c;
   event_system::instance().start();
@@ -1658,11 +1658,11 @@ TEST(file_manager, can_queue_and_remove_upload) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, remove_file_fails_if_open_file_is_modified) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1712,7 +1712,7 @@ TEST(file_manager, remove_file_fails_if_open_file_is_modified) {
     EXPECT_EQ(api_error::file_in_use, fm.remove_file("/test_remove.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, file_is_closed_after_download_timeout) {
@@ -1810,11 +1810,11 @@ TEST(file_manager, file_is_closed_after_download_timeout) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, remove_file_fails_if_file_does_not_exist) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
   {
     app_config cfg(provider_type::sia, file_manager_dir);
     cfg.set_enable_chunk_downloader_timeout(false);
@@ -1835,11 +1835,11 @@ TEST(file_manager, remove_file_fails_if_file_does_not_exist) {
     EXPECT_EQ(api_error::item_not_found, fm.remove_file("/test_remove.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 
 TEST(file_manager, remove_file_fails_if_provider_remove_file_fails) {
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 
   {
     app_config cfg(provider_type::sia, file_manager_dir);
@@ -1867,6 +1867,6 @@ TEST(file_manager, remove_file_fails_if_provider_remove_file_fails) {
     EXPECT_EQ(api_error::item_not_found, fm.remove_file("/test_remove.txt"));
   }
 
-  EXPECT_TRUE(utils::file::remove_directory(file_manager_dir, true));
+  EXPECT_TRUE(utils::file::directory(file_manager_dir).remove_recursively());
 }
 } // namespace repertory
diff --git a/repertory/repertory_test/src/providers_test.cpp b/repertory/repertory_test/src/providers_test.cpp
index 900b862a..7e528dbe 100644
--- a/repertory/repertory_test/src/providers_test.cpp
+++ b/repertory/repertory_test/src/providers_test.cpp
@@ -629,7 +629,7 @@ static void run_tests(const app_config &cfg, i_provider &provider) {
 TEST(providers, encrypt_provider) {
   const auto config_path =
       utils::path::combine(test::get_test_output_dir(), {"encrypt_provider"});
-  ASSERT_TRUE(utils::file::remove_directory(config_path, true));
+  ASSERT_TRUE(utils::file::directory(config_path).remove_recursively());
 
   console_consumer consumer{};
   event_system::instance().start();
@@ -672,7 +672,7 @@ TEST(providers, encrypt_provider) {
 TEST(providers, s3_provider) {
   const auto config_path =
       utils::path::combine(test::get_test_output_dir(), {"s3_provider"});
-  ASSERT_TRUE(utils::file::remove_directory(config_path, true));
+  ASSERT_TRUE(utils::file::directory(config_path).remove_recursively());
 
   console_consumer consumer{};
   event_system::instance().start();
@@ -711,7 +711,7 @@ TEST(providers, s3_provider) {
 TEST(providers, sia_provider) {
   const auto config_path =
       utils::path::combine(test::get_test_output_dir(), {"sia_provider"});
-  ASSERT_TRUE(utils::file::remove_directory(config_path, true));
+  ASSERT_TRUE(utils::file::directory(config_path).remove_recursively());
 
   console_consumer consumer{};
   event_system::instance().start();
diff --git a/repertory/repertory_test/src/remote_fuse_test.cpp b/repertory/repertory_test/src/remote_fuse_test.cpp
index 09f04248..1faf464c 100644
--- a/repertory/repertory_test/src/remote_fuse_test.cpp
+++ b/repertory/repertory_test/src/remote_fuse_test.cpp
@@ -434,7 +434,7 @@ static void mkdir_test(repertory::remote_fuse::remote_client &client) {
   const auto test_directory =
       utils::path::combine(fuse_remote_dir, {"mkdir_test"});
   const auto api_path = test_directory.substr(mount_location_.size());
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 
 #if defined(_WIN32)
   EXPECT_EQ(0, client.fuse_mkdir(api_path.c_str(), 0));
@@ -443,7 +443,7 @@ static void mkdir_test(repertory::remote_fuse::remote_client &client) {
 #endif
   EXPECT_TRUE(utils::file::directory(test_directory).exists());
 
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 }
 
 static void open_test(repertory::remote_fuse::remote_client &client) {
@@ -479,7 +479,7 @@ opendir_and_releasedir_test(repertory::remote_fuse::remote_client &client) {
   const auto test_directory =
       utils::path::combine(fuse_remote_dir, {"opendir_and_release_dir"});
   const auto api_path = test_directory.substr(mount_location_.size());
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 
 #if defined(_WIN32)
   EXPECT_EQ(0, client.fuse_mkdir(api_path.c_str(), 0));
@@ -492,7 +492,7 @@ opendir_and_releasedir_test(repertory::remote_fuse::remote_client &client) {
   EXPECT_EQ(0, client.fuse_opendir(api_path.c_str(), handle));
   EXPECT_EQ(0, client.fuse_releasedir(api_path.c_str(), handle));
 
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 }
 
 static void read_and_write_test(repertory::remote_fuse::remote_client &client) {
@@ -551,7 +551,7 @@ static void readdir_test(repertory::remote_fuse::remote_client &client) {
   const auto test_directory =
       utils::path::combine(fuse_remote_dir, {"readdir_test"});
   const auto api_path = test_directory.substr(mount_location_.size());
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 
 #if defined(_WIN32)
   EXPECT_EQ(0, client.fuse_mkdir(api_path.c_str(), 0));
@@ -572,7 +572,7 @@ static void readdir_test(repertory::remote_fuse::remote_client &client) {
 
   EXPECT_EQ(0, client.fuse_releasedir(api_path.c_str(), handle));
 
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 }
 
 /*static void removexattr_test(repertory::remote_fuse::remote_client &client) {
@@ -633,7 +633,7 @@ static void rmdir_test(repertory::remote_fuse::remote_client &client) {
   const auto test_directory =
       utils::path::combine(fuse_remote_dir, {"rmdir_test"});
   const auto api_path = test_directory.substr(mount_location_.size());
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 
 #if defined(_WIN32)
   EXPECT_EQ(0, client.fuse_mkdir(api_path.c_str(), 0));
@@ -645,7 +645,7 @@ static void rmdir_test(repertory::remote_fuse::remote_client &client) {
   EXPECT_EQ(0, client.fuse_rmdir(api_path.c_str()));
   EXPECT_FALSE(utils::file::directory(test_directory).exists());
 
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 }
 
 static void setattr_x_test(repertory::remote_fuse::remote_client &client) {
@@ -990,6 +990,6 @@ TEST(remote_fuse, all_tests) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(fuse_remote_dir, true));
+  EXPECT_TRUE(utils::file::directory(fuse_remote_dir).remove_recursively());
 }
 } // namespace fuse_test
diff --git a/repertory/repertory_test/src/remote_winfsp_test.cpp b/repertory/repertory_test/src/remote_winfsp_test.cpp
index bbc292bd..5e0ec63b 100644
--- a/repertory/repertory_test/src/remote_winfsp_test.cpp
+++ b/repertory/repertory_test/src/remote_winfsp_test.cpp
@@ -265,7 +265,7 @@ static void overwrite_test(remote_client &client) {
 static void create_and_read_directory_test(remote_client &client) {
   const auto test_directory =
       utils::path::combine(win_remote_dir, {"read_directory"});
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
   auto api_path =
       utils::string::from_utf8(test_directory).substr(mount_location_.size());
 
@@ -287,13 +287,13 @@ static void create_and_read_directory_test(remote_client &client) {
 
   EXPECT_EQ(STATUS_SUCCESS, client.winfsp_close(file_desc));
 
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 }
 
 static void open_and_read_directory_test(remote_client &client) {
   const auto test_directory =
       utils::path::combine(win_remote_dir, {"open_and_read_directory"});
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
   auto api_path =
       utils::string::from_utf8(test_directory).substr(mount_location_.size());
 
@@ -323,7 +323,7 @@ static void open_and_read_directory_test(remote_client &client) {
 
   EXPECT_EQ(STATUS_SUCCESS, client.winfsp_close(file_desc));
 
-  EXPECT_TRUE(utils::file::remove_directory(test_directory));
+  EXPECT_TRUE(utils::file::directory(test_directory).remove());
 }
 
 static void read_and_write_test(remote_client &client) {
@@ -535,6 +535,6 @@ TEST(remote_winfsp, all_tests) {
   }
 
   event_system::instance().stop();
-  EXPECT_TRUE(utils::file::remove_directory(win_remote_dir, true));
+  EXPECT_TRUE(utils::file::directory(win_remote_dir).remove_recursively());
 }
 } // namespace winfsp_test