diff --git a/lang/src/account.rs b/lang/src/accounts/account.rs
similarity index 100%
rename from lang/src/account.rs
rename to lang/src/accounts/account.rs
diff --git a/lang/src/account_info.rs b/lang/src/accounts/account_info.rs
similarity index 100%
rename from lang/src/account_info.rs
rename to lang/src/accounts/account_info.rs
diff --git a/lang/src/boxed.rs b/lang/src/accounts/boxed.rs
similarity index 100%
rename from lang/src/boxed.rs
rename to lang/src/accounts/boxed.rs
diff --git a/lang/src/cpi_account.rs b/lang/src/accounts/cpi_account.rs
similarity index 98%
rename from lang/src/cpi_account.rs
rename to lang/src/accounts/cpi_account.rs
index 7aa57d55f..21beeebcd 100644
--- a/lang/src/cpi_account.rs
+++ b/lang/src/accounts/cpi_account.rs
@@ -1,5 +1,5 @@
-use crate::error::ErrorCode;
 use crate::*;
+use crate::{error::ErrorCode, prelude::Account};
 use solana_program::account_info::AccountInfo;
 use solana_program::entrypoint::ProgramResult;
 use solana_program::instruction::AccountMeta;
diff --git a/lang/src/cpi_state.rs b/lang/src/accounts/cpi_state.rs
similarity index 98%
rename from lang/src/cpi_state.rs
rename to lang/src/accounts/cpi_state.rs
index b3bdc622b..2378b9ae8 100644
--- a/lang/src/cpi_state.rs
+++ b/lang/src/accounts/cpi_state.rs
@@ -1,10 +1,10 @@
 use crate::error::ErrorCode;
+#[allow(deprecated)]
+use crate::{accounts::state::ProgramState, CpiStateContext};
 use crate::{
     AccountDeserialize, AccountSerialize, Accounts, AccountsExit, Key, ToAccountInfo,
     ToAccountInfos, ToAccountMetas,
 };
-#[allow(deprecated)]
-use crate::{CpiStateContext, ProgramState};
 use solana_program::account_info::AccountInfo;
 use solana_program::entrypoint::ProgramResult;
 use solana_program::instruction::AccountMeta;
diff --git a/lang/src/loader.rs b/lang/src/accounts/loader.rs
similarity index 100%
rename from lang/src/loader.rs
rename to lang/src/accounts/loader.rs
diff --git a/lang/src/loader_account.rs b/lang/src/accounts/loader_account.rs
similarity index 100%
rename from lang/src/loader_account.rs
rename to lang/src/accounts/loader_account.rs
diff --git a/lang/src/accounts/mod.rs b/lang/src/accounts/mod.rs
new file mode 100644
index 000000000..1202a1703
--- /dev/null
+++ b/lang/src/accounts/mod.rs
@@ -0,0 +1,24 @@
+pub mod account;
+pub mod account_info;
+pub mod boxed;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub mod cpi_account;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub mod cpi_state;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub mod loader;
+pub mod loader_account;
+pub mod program;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub mod program_account;
+pub mod signer;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub mod state;
+pub mod system_account;
+pub mod sysvar;
+pub mod unchecked_account;
diff --git a/lang/src/program.rs b/lang/src/accounts/program.rs
similarity index 100%
rename from lang/src/program.rs
rename to lang/src/accounts/program.rs
diff --git a/lang/src/program_account.rs b/lang/src/accounts/program_account.rs
similarity index 99%
rename from lang/src/program_account.rs
rename to lang/src/accounts/program_account.rs
index f12aac429..a124e3e53 100644
--- a/lang/src/program_account.rs
+++ b/lang/src/accounts/program_account.rs
@@ -1,6 +1,6 @@
-use crate::error::ErrorCode;
 #[allow(deprecated)]
-use crate::CpiAccount;
+use crate::accounts::cpi_account::CpiAccount;
+use crate::error::ErrorCode;
 use crate::{
     AccountDeserialize, AccountSerialize, Accounts, AccountsClose, AccountsExit, Key,
     ToAccountInfo, ToAccountInfos, ToAccountMetas,
diff --git a/lang/src/signer.rs b/lang/src/accounts/signer.rs
similarity index 100%
rename from lang/src/signer.rs
rename to lang/src/accounts/signer.rs
diff --git a/lang/src/state.rs b/lang/src/accounts/state.rs
similarity index 99%
rename from lang/src/state.rs
rename to lang/src/accounts/state.rs
index f00cc230f..1c1f74457 100644
--- a/lang/src/state.rs
+++ b/lang/src/accounts/state.rs
@@ -1,6 +1,6 @@
-use crate::error::ErrorCode;
 #[allow(deprecated)]
-use crate::CpiAccount;
+use crate::accounts::cpi_account::CpiAccount;
+use crate::error::ErrorCode;
 use crate::{
     AccountDeserialize, AccountSerialize, Accounts, AccountsExit, Key, ToAccountInfo,
     ToAccountInfos, ToAccountMetas,
diff --git a/lang/src/system_account.rs b/lang/src/accounts/system_account.rs
similarity index 100%
rename from lang/src/system_account.rs
rename to lang/src/accounts/system_account.rs
diff --git a/lang/src/sysvar.rs b/lang/src/accounts/sysvar.rs
similarity index 100%
rename from lang/src/sysvar.rs
rename to lang/src/accounts/sysvar.rs
diff --git a/lang/src/unchecked_account.rs b/lang/src/accounts/unchecked_account.rs
similarity index 100%
rename from lang/src/unchecked_account.rs
rename to lang/src/accounts/unchecked_account.rs
diff --git a/lang/src/lib.rs b/lang/src/lib.rs
index cbfc24644..4cda3d424 100644
--- a/lang/src/lib.rs
+++ b/lang/src/lib.rs
@@ -31,58 +31,45 @@ use solana_program::program_error::ProgramError;
 use solana_program::pubkey::Pubkey;
 use std::io::Write;
 
-mod account;
-mod account_info;
 mod account_meta;
-mod boxed;
+mod accounts;
 mod bpf_upgradeable_state;
 mod common;
 mod context;
-mod cpi_account;
-mod cpi_state;
 mod ctor;
 mod error;
 #[doc(hidden)]
 pub mod idl;
-mod loader;
-mod loader_account;
-mod program;
-mod program_account;
-mod signer;
-pub mod state;
-mod system_account;
 mod system_program;
-mod sysvar;
-mod unchecked_account;
-mod vec;
 
-pub use crate::account::Account;
+pub use crate::accounts::account::Account;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub use crate::accounts::cpi_account::CpiAccount;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub use crate::accounts::cpi_state::CpiState;
+#[allow(deprecated)]
+pub use crate::accounts::loader::Loader;
+pub use crate::accounts::loader_account::AccountLoader;
+pub use crate::accounts::program::Program;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub use crate::accounts::program_account::ProgramAccount;
+pub use crate::accounts::signer::Signer;
+#[doc(hidden)]
+#[allow(deprecated)]
+pub use crate::accounts::state::ProgramState;
+pub use crate::accounts::system_account::SystemAccount;
+pub use crate::accounts::sysvar::Sysvar;
+pub use crate::accounts::unchecked_account::UncheckedAccount;
+pub use crate::system_program::System;
+mod vec;
 pub use crate::bpf_upgradeable_state::*;
 #[doc(hidden)]
 #[allow(deprecated)]
 pub use crate::context::CpiStateContext;
 pub use crate::context::{Context, CpiContext};
-#[doc(hidden)]
-#[allow(deprecated)]
-pub use crate::cpi_account::CpiAccount;
-#[doc(hidden)]
-#[allow(deprecated)]
-pub use crate::cpi_state::CpiState;
-#[allow(deprecated)]
-pub use crate::loader::Loader;
-pub use crate::loader_account::AccountLoader;
-pub use crate::program::Program;
-#[doc(hidden)]
-#[allow(deprecated)]
-pub use crate::program_account::ProgramAccount;
-pub use crate::signer::Signer;
-#[doc(hidden)]
-#[allow(deprecated)]
-pub use crate::state::ProgramState;
-pub use crate::system_account::SystemAccount;
-pub use crate::system_program::System;
-pub use crate::sysvar::Sysvar;
-pub use crate::unchecked_account::UncheckedAccount;
 pub use anchor_attribute_access_control::access_control;
 pub use anchor_attribute_account::{account, declare_id, zero_copy};
 pub use anchor_attribute_constant::constant;
@@ -262,7 +249,10 @@ pub mod prelude {
     };
 
     #[allow(deprecated)]
-    pub use super::{CpiAccount, CpiState, CpiStateContext, Loader, ProgramAccount, ProgramState};
+    pub use super::{
+        accounts::cpi_account::CpiAccount, accounts::cpi_state::CpiState, accounts::loader::Loader,
+        accounts::program_account::ProgramAccount, accounts::state::ProgramState, CpiStateContext,
+    };
 
     pub use borsh;
     pub use solana_program::account_info::{next_account_info, AccountInfo};
@@ -299,7 +289,7 @@ pub mod __private {
     pub use bytemuck;
 
     pub mod state {
-        pub use crate::state::*;
+        pub use crate::accounts::state::*;
     }
 
     // The starting point for user defined error codes.
@@ -327,7 +317,7 @@ pub mod __private {
         }
     }
 
-    pub use crate::state::PROGRAM_STATE_SEED;
+    pub use crate::accounts::state::PROGRAM_STATE_SEED;
     pub const CLOSED_ACCOUNT_DISCRIMINATOR: [u8; 8] = [255, 255, 255, 255, 255, 255, 255, 255];
 }