diff --git a/GROUPS b/GROUPS
deleted file mode 100644
index b0612a7..0000000
--- a/GROUPS
+++ /dev/null
@@ -1,29 +0,0 @@
-Amusements/Games
-Amusements/Graphics
-Applications/Archiving
-Applications/Communications
-Applications/Databases
-Applications/Editors
-Applications/Emulators
-Applications/Engineering
-Applications/File
-Applications/Internet
-Applications/Multimedia
-Applications/Productivity
-Applications/Publishing
-Applications/System
-Applications/Text
-Development/Debuggers
-Development/Languages
-Development/Libraries
-Development/System
-Development/Tools
-Documentation
-System Environment/Base
-System Environment/Daemons
-System Environment/Kernel
-System Environment/Libraries
-System Environment/Shells
-User Interface/Desktops
-User Interface/X
-User Interface/X Hardware Support
diff --git a/macros b/macros
deleted file mode 100644
index c21cc06..0000000
--- a/macros
+++ /dev/null
@@ -1,71 +0,0 @@
-#==============================================================================
-# ---- Midipix distribution base vendor macros
-#
-#
-#---------------------------------------------------------------------
-
-# Base distribution settings, this is what you change for your own branding
-%distribution		Midipix
-%vendor			Midipix
-#bugurl			https://git.midipix.org/
-%disturl		https://midipix.org/
-%_vendor		midipix
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_os			midipix
-%_host_ntbits		nt%{__isa_bits}
-%_build_ntbits		%{_host_ntbits}
-%_target_ntbits		%{_host_ntbits}
-%_target_platform	%{_target_cpu}-%{_target_ntbits}-%{_vendor}-%{_target_os}%{?_gnu}
-
-#==============================================================================
-# ---- configure macros.  note that most of these are inherited
-#      from the defaults.
-#
-# Set /var correctly
-%_localstatedir		/var
-%_sharedstatedir	%{_localstatedir}/lib
-
-# Set /etc correctly
-%_sysconfdir		/etc
-
-# Set prefix correctly
-%_prefix		/usr
-
-# Set docdirs correctly
-%_pkgdocdir             %{_docdir}/%{name}
-%_docdir_fmt            %%{NAME}
-
-# Set Fortran modules directory
-%_fmoddir		%{_libdir}/gfortran/modules
-
-# Extra useful paths
-%_iconsdir		%{_datadir}/icons
-%_localedir		%{_datadir}/locale
-%_logdir		%{_localstatedir}/log
-%_metainfodir		%{_datadir}/metainfo
-
-#==============================================================================
-# ---- Build policy macros.
-#
-#
-#---------------------------------------------------------------------
-#	Expanded at beginning of %install scriptlet.
-#
-%__spec_install_pre %{___build_pre}\
-    [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
-    mkdir -p `dirname "$RPM_BUILD_ROOT"`\
-    mkdir "$RPM_BUILD_ROOT"\
-%{nil}
-
-
-#---------------------------------------------------------------------
-#	RPM package build settings
-#
-
-# We want to use zstd payloads by default
-%_source_payload	w9.zstdio
-%_binary_payload	w9.zstdio
-
diff --git a/midipix/GROUPS b/midipix/GROUPS
new file mode 100644
index 0000000..b0612a7
--- /dev/null
+++ b/midipix/GROUPS
@@ -0,0 +1,29 @@
+Amusements/Games
+Amusements/Graphics
+Applications/Archiving
+Applications/Communications
+Applications/Databases
+Applications/Editors
+Applications/Emulators
+Applications/Engineering
+Applications/File
+Applications/Internet
+Applications/Multimedia
+Applications/Productivity
+Applications/Publishing
+Applications/System
+Applications/Text
+Development/Debuggers
+Development/Languages
+Development/Libraries
+Development/System
+Development/Tools
+Documentation
+System Environment/Base
+System Environment/Daemons
+System Environment/Kernel
+System Environment/Libraries
+System Environment/Shells
+User Interface/Desktops
+User Interface/X
+User Interface/X Hardware Support
diff --git a/midipix/macros b/midipix/macros
new file mode 100644
index 0000000..c21cc06
--- /dev/null
+++ b/midipix/macros
@@ -0,0 +1,71 @@
+#==============================================================================
+# ---- Midipix distribution base vendor macros
+#
+#
+#---------------------------------------------------------------------
+
+# Base distribution settings, this is what you change for your own branding
+%distribution		Midipix
+%vendor			Midipix
+#bugurl			https://git.midipix.org/
+%disturl		https://midipix.org/
+%_vendor		midipix
+
+#==============================================================================
+# ---- per-platform macros.
+#
+%_os			midipix
+%_host_ntbits		nt%{__isa_bits}
+%_build_ntbits		%{_host_ntbits}
+%_target_ntbits		%{_host_ntbits}
+%_target_platform	%{_target_cpu}-%{_target_ntbits}-%{_vendor}-%{_target_os}%{?_gnu}
+
+#==============================================================================
+# ---- configure macros.  note that most of these are inherited
+#      from the defaults.
+#
+# Set /var correctly
+%_localstatedir		/var
+%_sharedstatedir	%{_localstatedir}/lib
+
+# Set /etc correctly
+%_sysconfdir		/etc
+
+# Set prefix correctly
+%_prefix		/usr
+
+# Set docdirs correctly
+%_pkgdocdir             %{_docdir}/%{name}
+%_docdir_fmt            %%{NAME}
+
+# Set Fortran modules directory
+%_fmoddir		%{_libdir}/gfortran/modules
+
+# Extra useful paths
+%_iconsdir		%{_datadir}/icons
+%_localedir		%{_datadir}/locale
+%_logdir		%{_localstatedir}/log
+%_metainfodir		%{_datadir}/metainfo
+
+#==============================================================================
+# ---- Build policy macros.
+#
+#
+#---------------------------------------------------------------------
+#	Expanded at beginning of %install scriptlet.
+#
+%__spec_install_pre %{___build_pre}\
+    [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
+    mkdir -p `dirname "$RPM_BUILD_ROOT"`\
+    mkdir "$RPM_BUILD_ROOT"\
+%{nil}
+
+
+#---------------------------------------------------------------------
+#	RPM package build settings
+#
+
+# We want to use zstd payloads by default
+%_source_payload	w9.zstdio
+%_binary_payload	w9.zstdio
+