diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5599766..766635d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build
-      run: cd rust/rti; cargo build --verbose
+      run: cd core/federated; cargo build --verbose
 
   unit-tests:
     runs-on: ubuntu-latest
@@ -23,9 +23,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Unit tests
-        run: cd rust/rti; cargo test
+        run: cd core/federated; cargo test
 
-  lf-rust-rti:
+  integration-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -44,8 +44,8 @@ jobs:
         uses: chanijjani/lingua-franca/.github/actions/prepare-build-env@integration_tests_with_rust_rti 
       - name: Perform federated tests for C target with Rust RTI
         run:
-          git clone https://github.com/hokeun/lf-rust-rti.git;
-          cd lf-rust-rti;
+          git clone https://github.com/lf-lang/rust-rti.git;
+          cd rust-rti;
           git checkout ${{ github.head_ref }};
           cd ../;
           ./gradlew targetTest -Ptarget=RustRti
diff --git a/rust/.gitignore b/core/.gitignore
similarity index 100%
rename from rust/.gitignore
rename to core/.gitignore
diff --git a/rust/rti/Cargo.toml b/core/federated/Cargo.toml
similarity index 100%
rename from rust/rti/Cargo.toml
rename to core/federated/Cargo.toml
diff --git a/rust/rti/run_unit_tests.sh b/core/federated/run_unit_tests.sh
similarity index 99%
rename from rust/rti/run_unit_tests.sh
rename to core/federated/run_unit_tests.sh
index c5c14ab..0ceb830 100755
--- a/rust/rti/run_unit_tests.sh
+++ b/core/federated/run_unit_tests.sh
@@ -11,9 +11,10 @@
 # 1. grcov <== cargo install grcov
 # 2. llvm-tools-preview <== rustup component add llvm-tools-preview
 
-rm -rf ./target/coverage
 rm -rf cargo-test-*
 
+rm -rf ./target/coverage
+
 CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' LLVM_PROFILE_FILE='cargo-test-%p-%m.profraw' cargo test
 
 grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage
diff --git a/rust/rti/src/constants.rs b/core/federated/src/constants.rs
similarity index 100%
rename from rust/rti/src/constants.rs
rename to core/federated/src/constants.rs
diff --git a/rust/rti/src/federate_info.rs b/core/federated/src/federate_info.rs
similarity index 100%
rename from rust/rti/src/federate_info.rs
rename to core/federated/src/federate_info.rs
diff --git a/rust/rti/src/in_transit_message_queue.rs b/core/federated/src/in_transit_message_queue.rs
similarity index 100%
rename from rust/rti/src/in_transit_message_queue.rs
rename to core/federated/src/in_transit_message_queue.rs
diff --git a/rust/rti/src/lib.rs b/core/federated/src/lib.rs
similarity index 100%
rename from rust/rti/src/lib.rs
rename to core/federated/src/lib.rs
diff --git a/rust/rti/src/main.rs b/core/federated/src/main.rs
similarity index 100%
rename from rust/rti/src/main.rs
rename to core/federated/src/main.rs
diff --git a/rust/rti/src/message_record/message_record.rs b/core/federated/src/message_record/message_record.rs
similarity index 100%
rename from rust/rti/src/message_record/message_record.rs
rename to core/federated/src/message_record/message_record.rs
diff --git a/rust/rti/src/net_common.rs b/core/federated/src/net_common.rs
similarity index 100%
rename from rust/rti/src/net_common.rs
rename to core/federated/src/net_common.rs
diff --git a/rust/rti/src/net_util.rs b/core/federated/src/net_util.rs
similarity index 100%
rename from rust/rti/src/net_util.rs
rename to core/federated/src/net_util.rs
diff --git a/rust/rti/src/rti_common.rs b/core/federated/src/rti_common.rs
similarity index 100%
rename from rust/rti/src/rti_common.rs
rename to core/federated/src/rti_common.rs
diff --git a/rust/rti/src/rti_remote.rs b/core/federated/src/rti_remote.rs
similarity index 100%
rename from rust/rti/src/rti_remote.rs
rename to core/federated/src/rti_remote.rs
diff --git a/rust/rti/src/server.rs b/core/federated/src/server.rs
similarity index 100%
rename from rust/rti/src/server.rs
rename to core/federated/src/server.rs
diff --git a/rust/rti/src/tag.rs b/core/federated/src/tag.rs
similarity index 100%
rename from rust/rti/src/tag.rs
rename to core/federated/src/tag.rs
diff --git a/rust/rti/src/trace.rs b/core/federated/src/trace.rs
similarity index 100%
rename from rust/rti/src/trace.rs
rename to core/federated/src/trace.rs