diff --git a/.unittests b/.unittests
index d13fd45..ad2a3a3 100755
--- a/.unittests
+++ b/.unittests
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd swift/1.4.8/
-./.unittests
+cd ufo
+./.unittests $@
 cd -
diff --git a/swift/1.4.8/.unittests b/ufo/.unittests
similarity index 100%
rename from swift/1.4.8/.unittests
rename to ufo/.unittests
diff --git a/swift/1.4.8/README b/ufo/README
similarity index 100%
rename from swift/1.4.8/README
rename to ufo/README
diff --git a/swift/1.4.8/bin/gluster-swift-gen-builders b/ufo/bin/gluster-swift-gen-builders
similarity index 100%
rename from swift/1.4.8/bin/gluster-swift-gen-builders
rename to ufo/bin/gluster-swift-gen-builders
diff --git a/swift/1.4.8/etc/account-server/1.conf-gluster b/ufo/etc/account-server/1.conf-gluster
similarity index 100%
rename from swift/1.4.8/etc/account-server/1.conf-gluster
rename to ufo/etc/account-server/1.conf-gluster
diff --git a/swift/1.4.8/etc/container-server/1.conf-gluster b/ufo/etc/container-server/1.conf-gluster
similarity index 100%
rename from swift/1.4.8/etc/container-server/1.conf-gluster
rename to ufo/etc/container-server/1.conf-gluster
diff --git a/swift/1.4.8/etc/fs.conf-gluster b/ufo/etc/fs.conf-gluster
similarity index 100%
rename from swift/1.4.8/etc/fs.conf-gluster
rename to ufo/etc/fs.conf-gluster
diff --git a/swift/1.4.8/etc/object-server/1.conf-gluster b/ufo/etc/object-server/1.conf-gluster
similarity index 100%
rename from swift/1.4.8/etc/object-server/1.conf-gluster
rename to ufo/etc/object-server/1.conf-gluster
diff --git a/swift/1.4.8/etc/proxy-server.conf-gluster b/ufo/etc/proxy-server.conf-gluster
similarity index 100%
rename from swift/1.4.8/etc/proxy-server.conf-gluster
rename to ufo/etc/proxy-server.conf-gluster
diff --git a/swift/1.4.8/etc/swift.conf-gluster b/ufo/etc/swift.conf-gluster
similarity index 100%
rename from swift/1.4.8/etc/swift.conf-gluster
rename to ufo/etc/swift.conf-gluster
diff --git a/swift/1.4.8/gluster-swift-ufo.spec b/ufo/gluster-swift-ufo.spec
similarity index 100%
rename from swift/1.4.8/gluster-swift-ufo.spec
rename to ufo/gluster-swift-ufo.spec
diff --git a/swift/1.4.8/gluster/__init__.py b/ufo/gluster/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/__init__.py
rename to ufo/gluster/__init__.py
diff --git a/swift/1.4.8/gluster/swift/__init__.py b/ufo/gluster/swift/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/__init__.py
rename to ufo/gluster/swift/__init__.py
diff --git a/swift/1.4.8/gluster/swift/account/__init__.py b/ufo/gluster/swift/account/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/account/__init__.py
rename to ufo/gluster/swift/account/__init__.py
diff --git a/swift/1.4.8/gluster/swift/account/server.py b/ufo/gluster/swift/account/server.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/account/server.py
rename to ufo/gluster/swift/account/server.py
diff --git a/swift/1.4.8/gluster/swift/common/DiskDir.py b/ufo/gluster/swift/common/DiskDir.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/DiskDir.py
rename to ufo/gluster/swift/common/DiskDir.py
diff --git a/swift/1.4.8/gluster/swift/common/DiskFile.py b/ufo/gluster/swift/common/DiskFile.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/DiskFile.py
rename to ufo/gluster/swift/common/DiskFile.py
diff --git a/swift/1.4.8/gluster/swift/common/Glusterfs.py b/ufo/gluster/swift/common/Glusterfs.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/Glusterfs.py
rename to ufo/gluster/swift/common/Glusterfs.py
diff --git a/swift/1.4.8/gluster/swift/common/__init__.py b/ufo/gluster/swift/common/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/__init__.py
rename to ufo/gluster/swift/common/__init__.py
diff --git a/swift/1.4.8/gluster/swift/common/constraints.py b/ufo/gluster/swift/common/constraints.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/constraints.py
rename to ufo/gluster/swift/common/constraints.py
diff --git a/swift/1.4.8/gluster/swift/common/fs_utils.py b/ufo/gluster/swift/common/fs_utils.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/fs_utils.py
rename to ufo/gluster/swift/common/fs_utils.py
diff --git a/swift/1.4.8/gluster/swift/common/middleware/__init__.py b/ufo/gluster/swift/common/middleware/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/middleware/__init__.py
rename to ufo/gluster/swift/common/middleware/__init__.py
diff --git a/swift/1.4.8/gluster/swift/common/middleware/gluster.py b/ufo/gluster/swift/common/middleware/gluster.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/middleware/gluster.py
rename to ufo/gluster/swift/common/middleware/gluster.py
diff --git a/swift/1.4.8/gluster/swift/common/utils.py b/ufo/gluster/swift/common/utils.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/common/utils.py
rename to ufo/gluster/swift/common/utils.py
diff --git a/swift/1.4.8/gluster/swift/container/__init__.py b/ufo/gluster/swift/container/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/container/__init__.py
rename to ufo/gluster/swift/container/__init__.py
diff --git a/swift/1.4.8/gluster/swift/container/server.py b/ufo/gluster/swift/container/server.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/container/server.py
rename to ufo/gluster/swift/container/server.py
diff --git a/swift/1.4.8/gluster/swift/obj/__init__.py b/ufo/gluster/swift/obj/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/obj/__init__.py
rename to ufo/gluster/swift/obj/__init__.py
diff --git a/swift/1.4.8/gluster/swift/obj/server.py b/ufo/gluster/swift/obj/server.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/obj/server.py
rename to ufo/gluster/swift/obj/server.py
diff --git a/swift/1.4.8/gluster/swift/proxy/__init__.py b/ufo/gluster/swift/proxy/__init__.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/proxy/__init__.py
rename to ufo/gluster/swift/proxy/__init__.py
diff --git a/swift/1.4.8/gluster/swift/proxy/server.py b/ufo/gluster/swift/proxy/server.py
similarity index 100%
rename from swift/1.4.8/gluster/swift/proxy/server.py
rename to ufo/gluster/swift/proxy/server.py
diff --git a/swift/1.4.8/setup.py b/ufo/setup.py
similarity index 100%
rename from swift/1.4.8/setup.py
rename to ufo/setup.py
diff --git a/swift/1.4.8/test/__init__.py b/ufo/test/__init__.py
similarity index 100%
rename from swift/1.4.8/test/__init__.py
rename to ufo/test/__init__.py
diff --git a/swift/1.4.8/test/unit/__init__.py b/ufo/test/unit/__init__.py
similarity index 100%
rename from swift/1.4.8/test/unit/__init__.py
rename to ufo/test/unit/__init__.py
diff --git a/swift/1.4.8/test/unit/common/__init__.py b/ufo/test/unit/common/__init__.py
similarity index 100%
rename from swift/1.4.8/test/unit/common/__init__.py
rename to ufo/test/unit/common/__init__.py
diff --git a/swift/1.4.8/test/unit/common/data/account_tree.tar.bz2 b/ufo/test/unit/common/data/account_tree.tar.bz2
similarity index 100%
rename from swift/1.4.8/test/unit/common/data/account_tree.tar.bz2
rename to ufo/test/unit/common/data/account_tree.tar.bz2
diff --git a/swift/1.4.8/test/unit/common/data/container_tree.tar.bz2 b/ufo/test/unit/common/data/container_tree.tar.bz2
similarity index 100%
rename from swift/1.4.8/test/unit/common/data/container_tree.tar.bz2
rename to ufo/test/unit/common/data/container_tree.tar.bz2
diff --git a/swift/1.4.8/test/unit/common/test_utils.py b/ufo/test/unit/common/test_utils.py
similarity index 100%
rename from swift/1.4.8/test/unit/common/test_utils.py
rename to ufo/test/unit/common/test_utils.py