Repo reorg

Okay a big merge that will be a bit 'whoa nelly' but I don't want to let this thing 'hang out' too long.