diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 1fbbd3960fb57ff26930709d57bc291d2f1b2f53..11c317d0affc06ce75b97a77c25c1db4081575c1 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -18,8 +18,9 @@
             "compilerPath": "/usr/bin/clang",
             "cStandard": "c17",
             "cppStandard": "c++17",
-            "intelliSenseMode": "linux-clang-x64"
+            "intelliSenseMode": "linux-clang-x64",
+            "compileCommands": "/home/kubat/WORK/lektor/build/compile_commands.json"
         }
     ],
     "version": 4
-}
+}
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f73526798bbfe22cfaba0b057377efeadc37d2a..725a16d67ca55116f81053e4fb94e4242b326ec7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,13 +234,6 @@ set(lektord_SOURCES
     ${lektor_db_SOURCES}
 )
 
-set(lkt_SOURCES
-    src/main/lkt.c
-    src/base/common.c
-    src/base/segv.c
-    src/base/cmd.c
-)
-
 set(common_DEFINITIONS
     LKT_ARCH="${CMAKE_SYSTEM_PROCESSOR}"
     LKT_MAN_BINARY="${MAN}"
@@ -281,7 +274,6 @@ qt_add_executable(lektord
     ${lektord_SOURCES}
     ${SQL_GENERATED_FILE}
 )
-add_executable(lkt ${lkt_SOURCES})
 
 set_property(TARGET lektord PROPERTY CXX_STANDARD 20)
 
@@ -302,10 +294,7 @@ if(GENERATE_MANPAGES)
     endforeach()
 endif()
 
-target_include_directories(lkt     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc)
 target_include_directories(lektord PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CURL_INCLUDE_DIRS})
-
-target_compile_definitions(lkt     PRIVATE ${common_DEFINITIONS})
 target_compile_definitions(lektord PRIVATE ${common_DEFINITIONS}
     QT_DISABLE_DEPRECATED_BEFORE=0x050F00
     QT_NO_CAST_TO_ASCII
@@ -320,41 +309,24 @@ target_compile_options(lektord PRIVATE
     ${${CMAKE_BUILD_TYPE}_${CMAKE_C_COMPILER_ID}_C_FLAGS}
     ${${CMAKE_BUILD_TYPE}_${CMAKE_CXX_COMPILER_ID}_C_FLAGS}
 )
-target_compile_options(lkt PRIVATE
-    ${COMMON_C_FLAGS}
-    ${${CMAKE_C_COMPILER_ID}_C_FLAGS}
-    ${${CMAKE_CXX_COMPILER_ID}_CXX_FLAGS}
-    ${${CMAKE_BUILD_TYPE}_${CMAKE_C_COMPILER_ID}_C_FLAGS}
-    ${${CMAKE_BUILD_TYPE}_${CMAKE_CXX_COMPILER_ID}_C_FLAGS}
-)
 
 set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/Rust)
 
-ExternalProject_Add(amadeus_rs
+ExternalProject_Add(lektor_rust
     DOWNLOAD_COMMAND  ""
     CONFIGURE_COMMAND ""
     INSTALL_COMMAND   ""
-    SOURCE_DIR        "${CMAKE_SOURCE_DIR}/src/rust/amadeus-next"
+    SOURCE_DIR        "${CMAKE_SOURCE_DIR}/src/rust"
     BUILD_COMMAND     ${RUST_BUILD_CMD}
     COMMAND           ${RUST_BUILD_CMD}
-    BUILD_BYPRODUCTS  "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus"
-    BUILD_ALWAYS      1
-    BUILD_IN_SOURCE   1
-)
-
-ExternalProject_Add(liblektor_rs
-    DOWNLOAD_COMMAND  ""
-    CONFIGURE_COMMAND ""
-    INSTALL_COMMAND   ""
-    SOURCE_DIR        "${CMAKE_SOURCE_DIR}/src/rust/liblektor-rs"
-    BUILD_COMMAND     ${RUST_BUILD_CMD}
-    COMMAND           ${RUST_BUILD_CMD}
-    BUILD_BYPRODUCTS  "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/liblektor_unsafe.a"
     BUILD_ALWAYS      1
     BUILD_IN_SOURCE   1
+    BUILD_BYPRODUCTS  "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus"
+                      "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/lkt"
+                      "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/liblektor_unsafe.a"
 )
 
-add_dependencies(lektord liblektor_rs)
+add_dependencies(lektord lektor_rust)
 
 target_link_libraries(lektord
     PRIVATE
diff --git a/lektor.code-workspace b/lektor.code-workspace
index 33dae83601bbc6cb7e9c9a5844a5b6a2f6588984..53d9c2e6ef3ee85e73e296126edee70ee5ce9926 100644
--- a/lektor.code-workspace
+++ b/lektor.code-workspace
@@ -10,15 +10,11 @@
         },
         {
             "path": "src",
-            "name": "Lektor Sources"
+            "name": "C/C++ Sources"
         },
         {
-            "path": "src/rust/liblektor-rs",
-            "name": "Lektor Rust Lib Sources"
-        },
-        {
-            "path": "src/rust/amadeus-next",
-            "name": "Amadeus Next RS Sources"
+            "path": "src/rust",
+            "name": "Rust Sources"
         },
     ],
     "settings": {
@@ -32,4 +28,4 @@
         "rust-analyzer.procMacro.enable": true,
         "rust-analyzer.procMacro.attributes.enable": true,
     }
-}
+}
\ No newline at end of file
diff --git a/src/rust/liblektor-rs/Cargo.toml b/src/rust/Cargo.toml
similarity index 67%
rename from src/rust/liblektor-rs/Cargo.toml
rename to src/rust/Cargo.toml
index 6246c10777575bb0b8aef56946f17d07c5c091a4..0462249c51143cd2aee446fb159f750ddd05e6b8 100644
--- a/src/rust/liblektor-rs/Cargo.toml
+++ b/src/rust/Cargo.toml
@@ -1,11 +1,20 @@
 [workspace]
 resolver = "2"
 members = [
+    # Lektord
     "lektor_c_compat",
     "lektor_db",
     "lektor_repo",
     "lektor_unsafe",
+
+    # Common things
     "kurisu_api",
+    "commons",
+
+    # Clients
+    "amadeus",
+    "amalib",
+    "lkt-rs",
 ]
 
 [workspace.package]
@@ -18,13 +27,26 @@ license = "MIT"
 log = "0.4"
 libc = "0.2.0"
 lazy_static = "1"
+
 diesel_migrations = "2"
 diesel = { version = "2", default-features = false, features = ["sqlite"] }
+
+toml = { version = "^0.5", features = ["preserve_order"] }
 serde = { version = "^1", default-features = false, features = [
     "std",
     "derive",
 ] }
 
+tokio = { version = "1", features = [
+    "rt",
+    "rt-multi-thread",
+    "net",
+    "time",
+    "macros",
+    "sync",
+    "io-util",
+] }
+
 [profile.release]
 strip = true
 debug = false
diff --git a/src/rust/amadeus-next/Cargo.toml b/src/rust/amadeus-next/Cargo.toml
deleted file mode 100644
index 2ed2f9d8f687633cbb3ef11ab11be1d1beeec568..0000000000000000000000000000000000000000
--- a/src/rust/amadeus-next/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[profile.release]
-strip = true
-lto = true
-opt-level = "s"
-codegen-units = 1
-
-[workspace]
-resolver = "2"
-members = ["amadeus", "amalib", "commons", "lkt-rs"]
-
-[workspace.package]
-edition = "2021"
-authors = ["Maƫl MARTIN"]
-version = "0.1.0"
-license = "MIT"
-
-[workspace.dependencies]
-lazy_static = "1"
-toml = { version = "^0.5", features = ["preserve_order"] }
-serde = { version = "^1", default-features = false, features = [
-    "std",
-    "derive",
-] }
-tokio = { version = "1", features = [
-    "rt",
-    "rt-multi-thread",
-    "net",
-    "time",
-    "macros",
-    "sync",
-    "io-util",
-] }
diff --git a/src/rust/amadeus-next/amadeus/Cargo.toml b/src/rust/amadeus/Cargo.toml
similarity index 100%
rename from src/rust/amadeus-next/amadeus/Cargo.toml
rename to src/rust/amadeus/Cargo.toml
diff --git a/src/rust/amadeus-next/amadeus/src/main.rs b/src/rust/amadeus/src/main.rs
similarity index 100%
rename from src/rust/amadeus-next/amadeus/src/main.rs
rename to src/rust/amadeus/src/main.rs
diff --git a/src/rust/amadeus-next/amalib/Cargo.toml b/src/rust/amalib/Cargo.toml
similarity index 100%
rename from src/rust/amadeus-next/amalib/Cargo.toml
rename to src/rust/amalib/Cargo.toml
diff --git a/src/rust/amadeus-next/amalib/src/connexion.rs b/src/rust/amalib/src/connexion.rs
similarity index 100%
rename from src/rust/amadeus-next/amalib/src/connexion.rs
rename to src/rust/amalib/src/connexion.rs
diff --git a/src/rust/amadeus-next/amalib/src/constants.rs b/src/rust/amalib/src/constants.rs
similarity index 100%
rename from src/rust/amadeus-next/amalib/src/constants.rs
rename to src/rust/amalib/src/constants.rs
diff --git a/src/rust/amadeus-next/amalib/src/lib.rs b/src/rust/amalib/src/lib.rs
similarity index 100%
rename from src/rust/amadeus-next/amalib/src/lib.rs
rename to src/rust/amalib/src/lib.rs
diff --git a/src/rust/amadeus-next/amalib/src/query.rs b/src/rust/amalib/src/query.rs
similarity index 100%
rename from src/rust/amadeus-next/amalib/src/query.rs
rename to src/rust/amalib/src/query.rs
diff --git a/src/rust/amadeus-next/amalib/src/response.rs b/src/rust/amalib/src/response.rs
similarity index 100%
rename from src/rust/amadeus-next/amalib/src/response.rs
rename to src/rust/amalib/src/response.rs
diff --git a/src/rust/amadeus-next/amalib/src/uri.rs b/src/rust/amalib/src/uri.rs
similarity index 100%
rename from src/rust/amadeus-next/amalib/src/uri.rs
rename to src/rust/amalib/src/uri.rs
diff --git a/src/rust/amadeus-next/commons/Cargo.toml b/src/rust/commons/Cargo.toml
similarity index 100%
rename from src/rust/amadeus-next/commons/Cargo.toml
rename to src/rust/commons/Cargo.toml
diff --git a/src/rust/amadeus-next/commons/src/asserts.rs b/src/rust/commons/src/asserts.rs
similarity index 100%
rename from src/rust/amadeus-next/commons/src/asserts.rs
rename to src/rust/commons/src/asserts.rs
diff --git a/src/rust/amadeus-next/commons/src/error.rs b/src/rust/commons/src/error.rs
similarity index 100%
rename from src/rust/amadeus-next/commons/src/error.rs
rename to src/rust/commons/src/error.rs
diff --git a/src/rust/amadeus-next/commons/src/lib.rs b/src/rust/commons/src/lib.rs
similarity index 100%
rename from src/rust/amadeus-next/commons/src/lib.rs
rename to src/rust/commons/src/lib.rs
diff --git a/src/rust/amadeus-next/commons/src/log.rs b/src/rust/commons/src/log.rs
similarity index 100%
rename from src/rust/amadeus-next/commons/src/log.rs
rename to src/rust/commons/src/log.rs
diff --git a/src/rust/amadeus-next/commons/src/logger.rs b/src/rust/commons/src/logger.rs
similarity index 100%
rename from src/rust/amadeus-next/commons/src/logger.rs
rename to src/rust/commons/src/logger.rs
diff --git a/src/rust/amadeus-next/commons/src/macros.rs b/src/rust/commons/src/macros.rs
similarity index 100%
rename from src/rust/amadeus-next/commons/src/macros.rs
rename to src/rust/commons/src/macros.rs
diff --git a/src/rust/liblektor-rs/kurisu_api/Cargo.toml b/src/rust/kurisu_api/Cargo.toml
similarity index 100%
rename from src/rust/liblektor-rs/kurisu_api/Cargo.toml
rename to src/rust/kurisu_api/Cargo.toml
diff --git a/src/rust/liblektor-rs/kurisu_api/src/lib.rs b/src/rust/kurisu_api/src/lib.rs
similarity index 100%
rename from src/rust/liblektor-rs/kurisu_api/src/lib.rs
rename to src/rust/kurisu_api/src/lib.rs
diff --git a/src/rust/liblektor-rs/kurisu_api/src/v1.rs b/src/rust/kurisu_api/src/v1.rs
similarity index 100%
rename from src/rust/liblektor-rs/kurisu_api/src/v1.rs
rename to src/rust/kurisu_api/src/v1.rs
diff --git a/src/rust/liblektor-rs/lektor_c_compat/Cargo.toml b/src/rust/lektor_c_compat/Cargo.toml
similarity index 100%
rename from src/rust/liblektor-rs/lektor_c_compat/Cargo.toml
rename to src/rust/lektor_c_compat/Cargo.toml
diff --git a/src/rust/liblektor-rs/lektor_c_compat/src/c_types.rs b/src/rust/lektor_c_compat/src/c_types.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_c_compat/src/c_types.rs
rename to src/rust/lektor_c_compat/src/c_types.rs
diff --git a/src/rust/liblektor-rs/lektor_c_compat/src/lib.rs b/src/rust/lektor_c_compat/src/lib.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_c_compat/src/lib.rs
rename to src/rust/lektor_c_compat/src/lib.rs
diff --git a/src/rust/liblektor-rs/lektor_c_compat/src/rs_types/mod.rs b/src/rust/lektor_c_compat/src/rs_types/mod.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_c_compat/src/rs_types/mod.rs
rename to src/rust/lektor_c_compat/src/rs_types/mod.rs
diff --git a/src/rust/liblektor-rs/lektor_c_compat/src/rs_types/queue.rs b/src/rust/lektor_c_compat/src/rs_types/queue.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_c_compat/src/rs_types/queue.rs
rename to src/rust/lektor_c_compat/src/rs_types/queue.rs
diff --git a/src/rust/liblektor-rs/lektor_c_compat/src/rs_types/uri.rs b/src/rust/lektor_c_compat/src/rs_types/uri.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_c_compat/src/rs_types/uri.rs
rename to src/rust/lektor_c_compat/src/rs_types/uri.rs
diff --git a/src/rust/liblektor-rs/lektor_db/Cargo.toml b/src/rust/lektor_db/Cargo.toml
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/Cargo.toml
rename to src/rust/lektor_db/Cargo.toml
diff --git a/src/rust/liblektor-rs/lektor_db/build.rs b/src/rust/lektor_db/build.rs
similarity index 97%
rename from src/rust/liblektor-rs/lektor_db/build.rs
rename to src/rust/lektor_db/build.rs
index b27dd5f67942f72bfc8cbb8ee126474b20f80d03..e9253a49e8987b5586f9b4d664a94f4313dffa18 100644
--- a/src/rust/liblektor-rs/lektor_db/build.rs
+++ b/src/rust/lektor_db/build.rs
@@ -46,7 +46,7 @@ fn main() {
         .canonicalize()
         .expect("failed to canonicalize OUT_DIR");
     let source_dir = out_dir
-        .join("../../../../../liblektor-rs/lektor_db")
+        .join("../../../../../lektor_db")
         .canonicalize()
         .expect("failed to canonicalize the source path");
     let migration_dir = source_dir
diff --git a/src/rust/liblektor-rs/lektor_db/diesel.toml b/src/rust/lektor_db/diesel.toml
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/diesel.toml
rename to src/rust/lektor_db/diesel.toml
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2022-09-30-204512_initial/down.sql b/src/rust/lektor_db/migrations/2022-09-30-204512_initial/down.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2022-09-30-204512_initial/down.sql
rename to src/rust/lektor_db/migrations/2022-09-30-204512_initial/down.sql
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2022-09-30-204512_initial/up.sql b/src/rust/lektor_db/migrations/2022-09-30-204512_initial/up.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2022-09-30-204512_initial/up.sql
rename to src/rust/lektor_db/migrations/2022-09-30-204512_initial/up.sql
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093114_iso-639-1/down.sql b/src/rust/lektor_db/migrations/2023-01-24-093114_iso-639-1/down.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093114_iso-639-1/down.sql
rename to src/rust/lektor_db/migrations/2023-01-24-093114_iso-639-1/down.sql
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093114_iso-639-1/up.sql b/src/rust/lektor_db/migrations/2023-01-24-093114_iso-639-1/up.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093114_iso-639-1/up.sql
rename to src/rust/lektor_db/migrations/2023-01-24-093114_iso-639-1/up.sql
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093422_playlists/down.sql b/src/rust/lektor_db/migrations/2023-01-24-093422_playlists/down.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093422_playlists/down.sql
rename to src/rust/lektor_db/migrations/2023-01-24-093422_playlists/down.sql
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093422_playlists/up.sql b/src/rust/lektor_db/migrations/2023-01-24-093422_playlists/up.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-093422_playlists/up.sql
rename to src/rust/lektor_db/migrations/2023-01-24-093422_playlists/up.sql
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-125239_triggers/down.sql b/src/rust/lektor_db/migrations/2023-01-24-125239_triggers/down.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-125239_triggers/down.sql
rename to src/rust/lektor_db/migrations/2023-01-24-125239_triggers/down.sql
diff --git a/src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-125239_triggers/up.sql b/src/rust/lektor_db/migrations/2023-01-24-125239_triggers/up.sql
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/migrations/2023-01-24-125239_triggers/up.sql
rename to src/rust/lektor_db/migrations/2023-01-24-125239_triggers/up.sql
diff --git a/src/rust/liblektor-rs/lektor_db/src/connexion.rs b/src/rust/lektor_db/src/connexion.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/src/connexion.rs
rename to src/rust/lektor_db/src/connexion.rs
diff --git a/src/rust/liblektor-rs/lektor_db/src/error.rs b/src/rust/lektor_db/src/error.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/src/error.rs
rename to src/rust/lektor_db/src/error.rs
diff --git a/src/rust/liblektor-rs/lektor_db/src/lib.rs b/src/rust/lektor_db/src/lib.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/src/lib.rs
rename to src/rust/lektor_db/src/lib.rs
diff --git a/src/rust/liblektor-rs/lektor_db/src/models.rs b/src/rust/lektor_db/src/models.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/src/models.rs
rename to src/rust/lektor_db/src/models.rs
diff --git a/src/rust/liblektor-rs/lektor_db/src/queue.rs b/src/rust/lektor_db/src/queue.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/src/queue.rs
rename to src/rust/lektor_db/src/queue.rs
diff --git a/src/rust/liblektor-rs/lektor_db/src/schema.rs b/src/rust/lektor_db/src/schema.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_db/src/schema.rs
rename to src/rust/lektor_db/src/schema.rs
diff --git a/src/rust/liblektor-rs/lektor_repo/Cargo.toml b/src/rust/lektor_repo/Cargo.toml
similarity index 100%
rename from src/rust/liblektor-rs/lektor_repo/Cargo.toml
rename to src/rust/lektor_repo/Cargo.toml
diff --git a/src/rust/liblektor-rs/lektor_repo/src/lib.rs b/src/rust/lektor_repo/src/lib.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_repo/src/lib.rs
rename to src/rust/lektor_repo/src/lib.rs
diff --git a/src/rust/liblektor-rs/lektor_unsafe/Cargo.toml b/src/rust/lektor_unsafe/Cargo.toml
similarity index 100%
rename from src/rust/liblektor-rs/lektor_unsafe/Cargo.toml
rename to src/rust/lektor_unsafe/Cargo.toml
diff --git a/src/rust/liblektor-rs/lektor_unsafe/src/db.rs b/src/rust/lektor_unsafe/src/db.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_unsafe/src/db.rs
rename to src/rust/lektor_unsafe/src/db.rs
diff --git a/src/rust/liblektor-rs/lektor_unsafe/src/lib.rs b/src/rust/lektor_unsafe/src/lib.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_unsafe/src/lib.rs
rename to src/rust/lektor_unsafe/src/lib.rs
diff --git a/src/rust/liblektor-rs/lektor_unsafe/src/loging.rs b/src/rust/lektor_unsafe/src/loging.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_unsafe/src/loging.rs
rename to src/rust/lektor_unsafe/src/loging.rs
diff --git a/src/rust/liblektor-rs/lektor_unsafe/src/repo.rs b/src/rust/lektor_unsafe/src/repo.rs
similarity index 100%
rename from src/rust/liblektor-rs/lektor_unsafe/src/repo.rs
rename to src/rust/lektor_unsafe/src/repo.rs
diff --git a/src/rust/liblektor-rs/dependencies.png b/src/rust/liblektor-rs/dependencies.png
deleted file mode 100644
index 5e4e4ce12258caed146c834abbf8cb57e1a821a1..0000000000000000000000000000000000000000
Binary files a/src/rust/liblektor-rs/dependencies.png and /dev/null differ
diff --git a/src/rust/amadeus-next/lkt-rs/Cargo.toml b/src/rust/lkt-rs/Cargo.toml
similarity index 100%
rename from src/rust/amadeus-next/lkt-rs/Cargo.toml
rename to src/rust/lkt-rs/Cargo.toml
diff --git a/src/rust/amadeus-next/lkt-rs/src/args.rs b/src/rust/lkt-rs/src/args.rs
similarity index 100%
rename from src/rust/amadeus-next/lkt-rs/src/args.rs
rename to src/rust/lkt-rs/src/args.rs
diff --git a/src/rust/amadeus-next/lkt-rs/src/config.rs b/src/rust/lkt-rs/src/config.rs
similarity index 100%
rename from src/rust/amadeus-next/lkt-rs/src/config.rs
rename to src/rust/lkt-rs/src/config.rs
diff --git a/src/rust/amadeus-next/lkt-rs/src/main.rs b/src/rust/lkt-rs/src/main.rs
similarity index 100%
rename from src/rust/amadeus-next/lkt-rs/src/main.rs
rename to src/rust/lkt-rs/src/main.rs
diff --git a/src/rust/amadeus-next/lkt-rs/src/parsers.rs b/src/rust/lkt-rs/src/parsers.rs
similarity index 100%
rename from src/rust/amadeus-next/lkt-rs/src/parsers.rs
rename to src/rust/lkt-rs/src/parsers.rs
diff --git a/src/rust/amadeus-next/rsc/AmadeusLogo.jpg b/src/rust/rsc/AmadeusLogo.jpg
similarity index 100%
rename from src/rust/amadeus-next/rsc/AmadeusLogo.jpg
rename to src/rust/rsc/AmadeusLogo.jpg
diff --git a/src/rust/amadeus-next/rsc/IPAMincho.ttf b/src/rust/rsc/IPAMincho.ttf
similarity index 100%
rename from src/rust/amadeus-next/rsc/IPAMincho.ttf
rename to src/rust/rsc/IPAMincho.ttf
diff --git a/src/rust/amadeus-next/rsc/UbuntuMono-Regular.ttf b/src/rust/rsc/UbuntuMono-Regular.ttf
similarity index 100%
rename from src/rust/amadeus-next/rsc/UbuntuMono-Regular.ttf
rename to src/rust/rsc/UbuntuMono-Regular.ttf
diff --git a/src/rust/amadeus-next/rsc/UbuntuMono-UFL.txt b/src/rust/rsc/UbuntuMono-UFL.txt
similarity index 100%
rename from src/rust/amadeus-next/rsc/UbuntuMono-UFL.txt
rename to src/rust/rsc/UbuntuMono-UFL.txt
diff --git a/utils/scripts/update-cargo-deps.bash b/utils/scripts/update-cargo-deps.bash
index 2796a171faa69156b288d30eb20896b98774dce8..db19956eebcc35b9ac120fdc4e306da4e53c8b06 100755
--- a/utils/scripts/update-cargo-deps.bash
+++ b/utils/scripts/update-cargo-deps.bash
@@ -3,8 +3,5 @@
 set -e
 _ROOT="$(git rev-parse --show-toplevel)"
 
-for project in amadeus-next amadeus-rs liblektor-rs
-do
-    cd "$_ROOT/src/rust/$project"
-    cargo update
-done
+cd "$_ROOT/src/rust/"
+cargo update