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.
Best to at least make the variable name a bit more descriptive so people know what it's supposed to be.