Reorganized

I think this is ready to be used, obviously still a work in progress, but upgrading from this point forward is the purpose.  We just need to start actually doing the upgrades periodically and see what needs to change here to make it easier.