moving some files around to make it more MVC