Some organization changes
Rearranging some
Put hosts in $HOME/.hosts
Merge branch 'hosts'