diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index db3d6a6..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "terminal.integrated.shellIntegration.enabled": false
-}
\ No newline at end of file
diff --git a/module-defaults/httpd.yaml b/module-defaults/httpd.yaml
deleted file mode 100644
index a756aca..0000000
--- a/module-defaults/httpd.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-document: modulemd-defaults
-version: '1'
-data:
-  module: httpd
-  profiles: 
-    '2.4': [common]
\ No newline at end of file
diff --git a/module-defaults/mariadb.yaml b/module-defaults/mariadb.yaml
deleted file mode 100644
index c620d45..0000000
--- a/module-defaults/mariadb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-document: modulemd-defaults
-version: '1'
-data:
-  module: mariadb
-  profiles: 
-    '10.5': [common]
\ No newline at end of file
diff --git a/module-defaults/perl.yaml b/module-defaults/perl.yaml
deleted file mode 100644
index 1790162..0000000
--- a/module-defaults/perl.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-document: modulemd-defaults
-version: '1'
-data:
-  module: perl
-  profiles: 
-    '5.26': [common]
diff --git a/module-defaults/php.yaml b/module-defaults/php.yaml
deleted file mode 100644
index 2ab8392..0000000
--- a/module-defaults/php.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-document: modulemd-defaults
-version: '1'
-data:
-  module: php
-  profiles: 
-    'remi-8.3': [common]
diff --git a/module-defaults/python.yaml b/module-defaults/python.yaml
deleted file mode 100644
index 1b6dce5..0000000
--- a/module-defaults/python.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-document: modulemd-defaults
-version: '1'
-data:
-  module: python36
-  profiles: 
-    '3.6': [common]
diff --git a/LICENSE b/root/LICENSE
similarity index 100%
rename from LICENSE
rename to root/LICENSE
diff --git a/RPM-GPG-KEY-sme11 b/root/RPM-GPG-KEY-sme11
similarity index 100%
rename from RPM-GPG-KEY-sme11
rename to root/RPM-GPG-KEY-sme11
diff --git a/comps.xml b/root/comps.xml
similarity index 100%
rename from comps.xml
rename to root/comps.xml
diff --git a/ks.cfg b/root/ks.cfg
similarity index 100%
rename from ks.cfg
rename to root/ks.cfg
diff --git a/ks_netinstall.cfg b/root/netinstall/ks_netinstall.cfg
similarity index 100%
rename from ks_netinstall.cfg
rename to root/netinstall/ks_netinstall.cfg
diff --git a/variants.xml b/variants.xml
index 9475320..8f43e43 100644
--- a/variants.xml
+++ b/variants.xml
@@ -7,9 +7,9 @@
     </arches>
     <groups>
       <group default="false">anaconda-tools</group>
-      <group default="false">base</group>
-      <group default="false">core</group>
-      <group default="false">standard</group>
+      <group default="false">smebase</group>
+      <group default="false">smecore</group>
+      <group default="false">smestandard</group>
       <group default="false">smeextra</group>
     </groups>
     <environments>