Merge top level hosts with fixtures hosts file
Moved roles up 1 dir levle