Added controllers, services and renamed folder