diff --git a/framework/libra-framework/sources/modified_source/account.move b/framework/libra-framework/sources/modified_source/account.move
index 317ce1fe3..8fc54df2e 100644
--- a/framework/libra-framework/sources/modified_source/account.move
+++ b/framework/libra-framework/sources/modified_source/account.move
@@ -18,15 +18,19 @@ module diem_framework::account {
 
     // use diem_std::debug::print;
 
-    #[test_only]
-    friend diem_framework::diem_account;
     friend diem_framework::coin;
     friend diem_framework::genesis;
-    friend diem_framework::resource_account;
     friend diem_framework::transaction_validation;
     //////// 0L ////////
     friend ol_framework::ol_account;
     friend diem_framework::multisig_account;
+
+    #[test_only]
+    friend diem_framework::diem_account;
+    #[test_only]
+    friend diem_framework::resource_account;
+    //////// end 0L ////////
+
     /// Resource representing an account.
     struct Account has key, store {
         authentication_key: vector<u8>,
diff --git a/framework/libra-framework/sources/modified_specs_only/block.spec.move b/framework/libra-framework/sources/modified_source/modified_specs_only/block.spec.move
similarity index 100%
rename from framework/libra-framework/sources/modified_specs_only/block.spec.move
rename to framework/libra-framework/sources/modified_source/modified_specs_only/block.spec.move
diff --git a/framework/libra-framework/sources/modified_specs_only/consensus_config.spec.move b/framework/libra-framework/sources/modified_source/modified_specs_only/consensus_config.spec.move
similarity index 100%
rename from framework/libra-framework/sources/modified_specs_only/consensus_config.spec.move
rename to framework/libra-framework/sources/modified_source/modified_specs_only/consensus_config.spec.move
diff --git a/framework/libra-framework/sources/modified_specs_only/gas_schedule.spec.move b/framework/libra-framework/sources/modified_source/modified_specs_only/gas_schedule.spec.move
similarity index 100%
rename from framework/libra-framework/sources/modified_specs_only/gas_schedule.spec.move
rename to framework/libra-framework/sources/modified_source/modified_specs_only/gas_schedule.spec.move
diff --git a/framework/libra-framework/sources/modified_specs_only/version.spec.move b/framework/libra-framework/sources/modified_source/modified_specs_only/version.spec.move
similarity index 100%
rename from framework/libra-framework/sources/modified_specs_only/version.spec.move
rename to framework/libra-framework/sources/modified_source/modified_specs_only/version.spec.move
diff --git a/framework/libra-framework/sources/diem_account.move b/framework/libra-framework/sources/modified_source/test_only/diem_account.move
similarity index 100%
rename from framework/libra-framework/sources/diem_account.move
rename to framework/libra-framework/sources/modified_source/test_only/diem_account.move
diff --git a/framework/libra-framework/sources/diem_account.spec.move b/framework/libra-framework/sources/modified_source/test_only/diem_account.spec.move
similarity index 100%
rename from framework/libra-framework/sources/diem_account.spec.move
rename to framework/libra-framework/sources/modified_source/test_only/diem_account.spec.move
diff --git a/framework/libra-framework/sources/diem_coin.spec.move b/framework/libra-framework/sources/modified_source/test_only/diem_coin.spec.move.depr
similarity index 100%
rename from framework/libra-framework/sources/diem_coin.spec.move
rename to framework/libra-framework/sources/modified_source/test_only/diem_coin.spec.move.depr
diff --git a/framework/libra-framework/sources/diem_coin.move b/framework/libra-framework/sources/modified_source/test_only/diem_coin_test_only.move
similarity index 100%
rename from framework/libra-framework/sources/diem_coin.move
rename to framework/libra-framework/sources/modified_source/test_only/diem_coin_test_only.move
diff --git a/framework/libra-framework/sources/resource_account.spec.move b/framework/libra-framework/sources/modified_source/test_only/resource_account.spec.move.depr
similarity index 100%
rename from framework/libra-framework/sources/resource_account.spec.move
rename to framework/libra-framework/sources/modified_source/test_only/resource_account.spec.move.depr
diff --git a/framework/libra-framework/sources/resource_account.move b/framework/libra-framework/sources/modified_source/test_only/resource_account_test_only.move
similarity index 99%
rename from framework/libra-framework/sources/resource_account.move
rename to framework/libra-framework/sources/modified_source/test_only/resource_account_test_only.move
index 3c2d01579..be22f03c8 100644
--- a/framework/libra-framework/sources/resource_account.move
+++ b/framework/libra-framework/sources/modified_source/test_only/resource_account_test_only.move
@@ -1,3 +1,4 @@
+#[test_only]
 /// A resource account is used to manage resources independent of an account managed by a user.
 /// This contains several utilities to make using resource accounts more effective.
 ///
@@ -58,6 +59,7 @@
 ///    module.resource_signer_cap = option::some(resource_signer_cap);
 /// }
 /// ```
+
 module diem_framework::resource_account {
     use std::error;
     use std::signer;
diff --git a/framework/libra-framework/sources/ol_sources/gas_coin.spec.move b/framework/libra-framework/sources/ol_sources/libra_coin.spec.move
similarity index 81%
rename from framework/libra-framework/sources/ol_sources/gas_coin.spec.move
rename to framework/libra-framework/sources/ol_sources/libra_coin.spec.move
index cbd03098f..15912bc8d 100644
--- a/framework/libra-framework/sources/ol_sources/gas_coin.spec.move
+++ b/framework/libra-framework/sources/ol_sources/libra_coin.spec.move
@@ -1,4 +1,4 @@
-spec diem_framework::diem_coin {
+spec ol_framework::libra_coin {
     spec module {
         pragma verify = true;
         pragma aborts_if_is_strict;
@@ -8,7 +8,7 @@ spec diem_framework::diem_coin {
         pragma aborts_if_is_partial;
         let addr = signer::address_of(diem_framework);
         ensures exists<MintCapStore>(addr);
-        ensures exists<coin::CoinInfo<DiemCoin>>(addr);
+        ensures exists<coin::CoinInfo<LibraCoin>>(addr);
     }
 
     spec destroy_mint_cap {
@@ -22,10 +22,10 @@ spec diem_framework::diem_coin {
         pragma verify = false;
     }
 
-    // Only callable in tests and testnets.not needed verify.
-    spec mint {
-        pragma verify = false;
-    }
+    // // Only callable in tests and testnets.not needed verify.
+    // spec mint {
+    //     pragma verify = false;
+    // }
 
     // Only callable in tests and testnets.not needed verify.
     spec delegate_mint_capability {
diff --git a/framework/releases/release-6.9.6.mrb b/framework/releases/release-6.9.6.mrb
deleted file mode 100644
index f9a6d13a2..000000000
Binary files a/framework/releases/release-6.9.6.mrb and /dev/null differ