Reorgansied some of the classes into models, named after the things they represent
Cant remember what i did
Correct some ommited imports