Remove unused roles
Name the virtual machine to the directory that it belongs to