Added Instructor and Admin controller, test, service classes
merged