Refactor and simplify codebase

[feldoh]

An artefact of this being initially made as a hackathon and while using new tech, is that the code is not nicely organised. Particularly, the controller is a huge file weighing in at over 500 lines. Thus there should be a tidy up and a checkstyle plugin applied to try and improve the quality of this codebase.