Reintroduced split between models and the rest, cleaned up travis config