Refactor models into separate organised files