Moved to new file structure, implemented all controllers