update: move every service to host+service, to get the best of each :D