Renamed MasterController file and directory