Reorganised just about every file and deleted a bunch of old unused scripts
Added some bits I missed