diff --git a/EVM-and-opcodes/README.md b/evm_and_opcods/README.md
similarity index 100%
rename from EVM-and-opcodes/README.md
rename to evm_and_opcods/README.md
diff --git a/EVM-and-opcodes/opcodes.md b/evm_and_opcods/opcodes.md
similarity index 100%
rename from EVM-and-opcodes/opcodes.md
rename to evm_and_opcods/opcodes.md
diff --git a/Gray-Hat/README.md b/gray_hat_stuff/README.md
similarity index 100%
rename from Gray-Hat/README.md
rename to gray_hat_stuff/README.md
diff --git a/Solidity-Expert/Boilerplates/erc721-solidity-101/.env_sample b/master_solidity/boilerplates/erc721-solidity-101/.env_sample
similarity index 100%
rename from Solidity-Expert/Boilerplates/erc721-solidity-101/.env_sample
rename to master_solidity/boilerplates/erc721-solidity-101/.env_sample
diff --git a/Solidity-Expert/Boilerplates/erc721-solidity-101/README.md b/master_solidity/boilerplates/erc721-solidity-101/README.md
similarity index 100%
rename from Solidity-Expert/Boilerplates/erc721-solidity-101/README.md
rename to master_solidity/boilerplates/erc721-solidity-101/README.md
diff --git a/Solidity-Expert/Boilerplates/erc721-solidity-101/contracts/MiaNFT.sol b/master_solidity/boilerplates/erc721-solidity-101/contracts/MiaNFT.sol
similarity index 100%
rename from Solidity-Expert/Boilerplates/erc721-solidity-101/contracts/MiaNFT.sol
rename to master_solidity/boilerplates/erc721-solidity-101/contracts/MiaNFT.sol
diff --git a/Solidity-Expert/Boilerplates/erc721-solidity-101/hardhat.config.js b/master_solidity/boilerplates/erc721-solidity-101/hardhat.config.js
similarity index 100%
rename from Solidity-Expert/Boilerplates/erc721-solidity-101/hardhat.config.js
rename to master_solidity/boilerplates/erc721-solidity-101/hardhat.config.js
diff --git a/Solidity-Expert/Boilerplates/erc721-solidity-101/package.json b/master_solidity/boilerplates/erc721-solidity-101/package.json
similarity index 100%
rename from Solidity-Expert/Boilerplates/erc721-solidity-101/package.json
rename to master_solidity/boilerplates/erc721-solidity-101/package.json
diff --git a/Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/deploy-contract.js b/master_solidity/boilerplates/erc721-solidity-101/scripts/deploy-contract.js
similarity index 100%
rename from Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/deploy-contract.js
rename to master_solidity/boilerplates/erc721-solidity-101/scripts/deploy-contract.js
diff --git a/Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/mint-nft.js b/master_solidity/boilerplates/erc721-solidity-101/scripts/mint-nft.js
similarity index 100%
rename from Solidity-Expert/Boilerplates/erc721-solidity-101/scripts/mint-nft.js
rename to master_solidity/boilerplates/erc721-solidity-101/scripts/mint-nft.js
diff --git a/Solidity-Expert/L2-and-Rollups/README.md b/master_solidity/l2_and_rollups/README.md
similarity index 100%
rename from Solidity-Expert/L2-and-Rollups/README.md
rename to master_solidity/l2_and_rollups/README.md
diff --git a/Solidity-Expert/Tricks-to-save-gas/README.md b/master_solidity/saving_gas/README.md
similarity index 100%
rename from Solidity-Expert/Tricks-to-save-gas/README.md
rename to master_solidity/saving_gas/README.md
diff --git a/Solidity-Expert/Setting-up-your-workspace/remix-IDE.md b/master_solidity/setting_workspace/remix-IDE.md
similarity index 100%
rename from Solidity-Expert/Setting-up-your-workspace/remix-IDE.md
rename to master_solidity/setting_workspace/remix-IDE.md
diff --git a/Solidity-Expert/Writing-Tests/unit-testing.md b/master_solidity/tests/unit-testing.md
similarity index 100%
rename from Solidity-Expert/Writing-Tests/unit-testing.md
rename to master_solidity/tests/unit-testing.md
diff --git a/Solidity-Expert/Token-standards/README.md b/master_solidity/token_standards/README.md
similarity index 100%
rename from Solidity-Expert/Token-standards/README.md
rename to master_solidity/token_standards/README.md
diff --git a/Solidity-Expert/Token-standards/erc20.md b/master_solidity/token_standards/erc20.md
similarity index 100%
rename from Solidity-Expert/Token-standards/erc20.md
rename to master_solidity/token_standards/erc20.md
diff --git a/Solidity-Expert/Token-standards/erc721.md b/master_solidity/token_standards/erc721.md
similarity index 100%
rename from Solidity-Expert/Token-standards/erc721.md
rename to master_solidity/token_standards/erc721.md
diff --git a/Solidity-Expert/Token-standards/erc777.md b/master_solidity/token_standards/erc777.md
similarity index 100%
rename from Solidity-Expert/Token-standards/erc777.md
rename to master_solidity/token_standards/erc777.md
diff --git a/Smart-Contract-Security/README.md b/smart_contracts_vulnerabilities/README.md
similarity index 100%
rename from Smart-Contract-Security/README.md
rename to smart_contracts_vulnerabilities/README.md
diff --git a/Smart-Contract-Security/arithmetic-bugs-notes.md b/smart_contracts_vulnerabilities/arithmetic-bugs-notes.md
similarity index 100%
rename from Smart-Contract-Security/arithmetic-bugs-notes.md
rename to smart_contracts_vulnerabilities/arithmetic-bugs-notes.md
diff --git a/Smart-Contract-Security/ddos-notes.md b/smart_contracts_vulnerabilities/ddos-notes.md
similarity index 100%
rename from Smart-Contract-Security/ddos-notes.md
rename to smart_contracts_vulnerabilities/ddos-notes.md
diff --git a/Smart-Contract-Security/delegatecall-notes.md b/smart_contracts_vulnerabilities/delegatecall-notes.md
similarity index 100%
rename from Smart-Contract-Security/delegatecall-notes.md
rename to smart_contracts_vulnerabilities/delegatecall-notes.md
diff --git a/Smart-Contract-Security/pentesting.md b/smart_contracts_vulnerabilities/pentesting.md
similarity index 100%
rename from Smart-Contract-Security/pentesting.md
rename to smart_contracts_vulnerabilities/pentesting.md
diff --git a/Smart-Contract-Security/proxies.md b/smart_contracts_vulnerabilities/proxies.md
similarity index 100%
rename from Smart-Contract-Security/proxies.md
rename to smart_contracts_vulnerabilities/proxies.md
diff --git a/Smart-Contract-Security/random-notes.md b/smart_contracts_vulnerabilities/random-notes.md
similarity index 100%
rename from Smart-Contract-Security/random-notes.md
rename to smart_contracts_vulnerabilities/random-notes.md
diff --git a/Smart-Contract-Security/reentrancy-notes.md b/smart_contracts_vulnerabilities/reentrancy-notes.md
similarity index 100%
rename from Smart-Contract-Security/reentrancy-notes.md
rename to smart_contracts_vulnerabilities/reentrancy-notes.md
diff --git a/Smart-Contract-Security/sandwich-notes.md b/smart_contracts_vulnerabilities/sandwich-notes.md
similarity index 100%
rename from Smart-Contract-Security/sandwich-notes.md
rename to smart_contracts_vulnerabilities/sandwich-notes.md