Reorganized

Figured out to organize classes into separate files
No code has been changed since last update