server, regular.mk: adjust accordingly

conf.d/regular.mk

@@ -250,12 +250,12 @@ distro/.regular-server-managed: distro/.regular-server
 	@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
 
 distro/regular-server: distro/.regular-server-managed use/server/groups/base
-	@$(call add,MAIN_GROUPS,sambaDC-server)
-	@$(call add,MAIN_GROUPS,hyperv-tools)
+	@$(call add,MAIN_GROUPS,server/sambaDC)
+	@$(call add,MAIN_GROUPS,tools/hyperv)
 
 distro/regular-server-ovz: distro/.regular-server \
 	use/server/ovz use/server/groups/tools use/cleanup/x11-alterator
-	@$(call add,MAIN_GROUPS,vzstats)
+	@$(call add,MAIN_GROUPS,tools/vzstats)
 
 distro/regular-server-hyperv: distro/.regular-server-managed
 	@$(call set,KFLAVOURS,un-def)
@@ -265,7 +265,7 @@ distro/regular-server-hyperv: distro/.regular-server-managed
 
 distro/.regular-server-openstack: distro/.regular-server-base \
 	use/firmware/qlogic use/server/groups/openstack
-	@$(call add,MAIN_GROUPS,ipmi monitoring)
+	@$(call add,MAIN_GROUPS,tools/ipmi tools/monitoring)
 
 distro/regular-server-openstack: distro/.regular-server-openstack +systemd; @:
 

features.in/server/config.mk

@@ -36,12 +36,12 @@ use/server/zabbix: use/server use/services use/control
 	@$(call add,CONTROL,postfix:server)
 
 use/server/groups/tools: use/server
-	@$(call add,MAIN_GROUPS,diag-tools ipmi monitoring)
+	@$(call add,MAIN_GROUPS,tools/diag tools/ipmi tools/monitoring)
 
 use/server/groups/services: use/server
-	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
-	@$(call add,MAIN_GROUPS,dhcp-server mail-server mysql-server)
-	@$(call add,MAIN_GROUPS,pgsql-server)
+	@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)
+	@$(call add,MAIN_GROUPS,server/dhcp server/mail server/mysql)
+	@$(call add,MAIN_GROUPS,server/pgsql)
 
 use/server/groups/base: use/server/groups/tools use/server/groups/services; @: