Tidy Up 2

Moved classes, lists and enums out to their own files, currently
repairing the damage this has caused, disabled a few things.