Refactoring
Lots o refactoring (getting rid of ActionView and ControlPanel, as they were not named well)