Renamed classes/files. Code cleanup