Fixed: Controller naming convents and put components into a more reasonable place