Removed unused classes and renamed ServiceDirectory ServiceController.