Continued Refactoring

Renaming classes and adding comments