renaming to temp names
Final renaming. Temporary renaming due to git case sensitive is not supported in mac os x.
Refactored to adjust the refactored controllers and other files