Fix build to deal with Hosts and Devices subdirs