Refactor system Submodules

[charitylxy]

• [ ] This contribution adheres to CONTRIBUTING.md.

TODO: Check the above box with an 'x' indicating you've read and followed CONTRIBUTING.md.

What does this Pull Request accomplish?

TODO: Include high-level description of the changes in this pull request.

Why should this Pull Request be merged?

TODO: Justify why this contribution should be part of the project.

What testing has been done?

TODO: Detail what testing has been done to ensure this submission meets requirements.