refactoring java files to reflect MVC
 zooi
Merge branch 'gamelogic'
Renamed files to fit in the new MVC-structure