better organization of hosts