Added controllers and main app module