Major class reorganization
Trivial things