Renamed files to fit in the new MVC-structure