Added basic structure and main controller