Subsystem restructuring. Please avoid merging stuff which would conflict with this. This took days to update.

some recent merges were lost due to entire conflicting files. I did ask nicely.
Yeah apologies, I looked more in depth into what it actually does the other day but never removed this.
(if you want the comments on these lines remove just ask)