Separate into MVC structure, create models