Changed class prefix and refactored class names. -Micah