diff --git a/f14/f14-basic.appl b/f14-basic.appl
similarity index 100%
rename from f14/f14-basic.appl
rename to f14-basic.appl
diff --git a/g6/f14-basic.appl b/g6/f14-basic.appl
deleted file mode 100644
index 730f896..0000000
--- a/g6/f14-basic.appl
+++ /dev/null
@@ -1,17 +0,0 @@
-name: f14-basic
-summary: Just Enough Operating System based on Fedora 14
-default_repos: false
-os:
-  name: fedora
-  version: 14
-hardware:
-  partitions:
-    "/":
-      size: 2
-packages:
-  - @core
-repos:
-  - name: "fedora-14"
-    baseurl: "http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/releases/14/Fedora/x86_64/os/"
-  - name: "fedora-14-updates"
-    baseurl: "http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/updates/14/x86_64/"
diff --git a/g6/sysadminSG-common.appl b/g6/sysadminSG-common.appl
deleted file mode 100644
index ace14cb..0000000
--- a/g6/sysadminSG-common.appl
+++ /dev/null
@@ -1,30 +0,0 @@
-name: sysadminSG-common
-summary: System Administration Study Group Common components
-default_repos: false
-os:
-  name: fedora
-  version: 14
-hardware:
-  memory: 512
-  partitions:
-    "/":
-      size: 3
-packages:
-    - @base
-    - vim-enhanced
-    - nano
-    - emacs-nox
-    - joe
-    - xorg-x11-xauth
-    - PackageKit-gtk-module
-    - libcanberra-gtk2
-    - xorg-x11-fonts-Type1
-repos:
-    - name: "fedora-14"
-      baseurl: "http://mirror.cc.vt.edu/pub/fedora/linux/releases/14/Everything/x86_64/os/"
-    - name: "fedora-14-updates"
-      baseurl: "http://mirror.cc.vt.edu/pub/fedora/linux/updates/14/x86_64/"
-post:
-  base:
-    - "rm /etc/yum.repos.d/fedora.repo"
-    - "rm /etc/yum.repos.d/fedora-updates.repo"
diff --git a/f14/sysadminSG-common.appl b/sysadminSG-common.appl
similarity index 100%
rename from f14/sysadminSG-common.appl
rename to sysadminSG-common.appl
diff --git a/f14/sysadminSG.appl b/sysadminSG-f14.appl
similarity index 100%
rename from f14/sysadminSG.appl
rename to sysadminSG-f14.appl
diff --git a/g6/sysadminSG.appl b/sysadminSG-g6.appl
similarity index 100%
rename from g6/sysadminSG.appl
rename to sysadminSG-g6.appl
diff --git a/f14/sysadminSG-master.appl b/sysadminSG-master-f14.appl
similarity index 100%
rename from f14/sysadminSG-master.appl
rename to sysadminSG-master-f14.appl
diff --git a/g6/sysadminSG-master.appl b/sysadminSG-master-g6.appl
similarity index 100%
rename from g6/sysadminSG-master.appl
rename to sysadminSG-master-g6.appl