Lots of refactoring to start working on refactoring code. Very very basic class rename implemented for classes that are not used anywhere.