Added bootstrap & moved MainController