Modules
Merge branch 'feature/CleanUp' into release/0.0.8
Linking new modules
Merge branch 'feature/CleanUp' into release/0.0.8