Refactored the whole view-package, moved main to its own package (controller)