fixes organization a bit
organizes things in a better MVC manner