Refactored class names to be less generic. Also began refactoring to conform to the MVC pattern.