Moved code into separate files and namespaces
Grouped items
Grouped items
Merge branch 'feature/cleanup' into develop