Class Repackage

Repacked classes based on functionality