Moving the classes over to classes module
Reorganizing...