Moved loads of stuff around
Removed moved files.