Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/xos-observer.py b/xos/synchronizers/openstack/xos-synchronizer.py
similarity index 100%
rename from xos/xos-observer.py
rename to xos/synchronizers/openstack/xos-synchronizer.py
diff --git a/xos/tools/chuckmove b/xos/tools/chuckmove
index 8aba34b..8f33432 100755
--- a/xos/tools/chuckmove
+++ b/xos/tools/chuckmove
@@ -29,7 +29,7 @@
comment = '#' + SkipTo(lineEnd)
-module_ns = Word(alphanums + '-' + '_' + '.')
+module_ns = Word(alphanums + '-' + '_' + '.' + ',')
old_module_ns = Combine(old_ns + Optional(Combine('.'+module_ns)))
end_of_python_line = Or([lineEnd,comment])