Reorganize host configurations
Tweaks to defaults