Cleanup and restructure architecture

[simoneldevig]

Clean up the sourcecode and restructure the architecture since it's currently not ideal for future development.