Formatting fixes
Moved unused classes to unused folder to tidy up source tree