Class names refactored.
Minor code clean-up.
Remove previously renamed files from the source control.