Started work on migrating most of the code to more sensible locations and files