Start moving things into seperate files

Currently broken