Cleanup.
Moved some files.
Merge branch 'feature/modular' into develop