diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py
index 365a769..26ae541 100644
--- a/NeoBoot/extract.py
+++ b/NeoBoot/extract.py
@@ -804,6 +804,8 @@ def RemoveUnpackDirs():
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/bootargs.bin ' + getNeoLocation() + 'ImagesUpload/amiko')
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/fastboot.bin ' + getNeoLocation() + 'ImagesUpload/amiko')
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/amiko')
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/gigablue/x1'):
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/gigablue')        
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/gigablue'):
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/gigablue')
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/apploader.bin ' + getNeoLocation() + 'ImagesUpload/gigablue')
@@ -1213,6 +1215,8 @@ def NEOBootExtract(source, target, ZipDelete):
                     os.chdir('gigablue')
                     if os.path.exists('' + getNeoLocation() + 'ImagesUpload/gigablue/quad'):
                         os.chdir('quad')
+                    if os.path.exists('' + getNeoLocation() + 'ImagesUpload/gigablue/x1'):
+                        os.chdir('x1')                        
                 if os.path.exists('' + getNeoLocation() + 'ImagesUpload/hd2400'):
                     os.chdir('hd2400')
                 if os.path.exists('' + getNeoLocation() + 'ImagesUpload/hd51'):