Restructure codebase into more intelligent design #20
Description
There has been lots of little development in the last 6 months on this project and as such there are lots of old code that isn't used anymore or is in the wrong package. Restructure the codebase to reflect best practices.