Continued Work

Grouped similar subclasses into parent files, methods added to Surface
class