Moved some models into separate files
Separated all models, tests seem to be passing
merged (?)