Reorganize server
Rename everything to hive some sane defaults
More renaming!