diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..09e6585
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,79 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#Python
+*.pyc
+*.out
+#CPP
+*.o
+*.la
+*.lo
+*.vglog
+.dirstamp
+Makefile.in
+config\.*
+configure
+.deps
+.libs
+autom4te.cache
+aclocal.m4
+developer.doxygen
+user.doxygen
+qpid/cpp/libtool
+qpidc.spec
+qpid/cpp/src/gen/
+*gen.mk
+*.timestamp
+*.pcl
+qpid/cpp/managementgen/management-types.xml
+
+#Java
+*.class
+velocity.log*
+qpid/java/build
+release
+.classpath
+.project
+.settings
+generated/
+target
+qpid/java/lib/cobertura
+qpid/java/lib/findbugs
+qpid/java/lib/ivy
+# Intellij Project files
+*.iml
+*.ipr
+*.iws
+# Emacs
+*~
+# Microsoft Visual Studio artifacts
+*.vcproj.*.*.user
+*.ncb
+*.suo
+*.ilk
+*.pdb
+# Windows build results
+*.exe
+*.lib
+*.dll
+# MacOS File
+.DS_Store
+
+#Eclipse workspace
+workspace/
diff --git a/KEYS b/qpid/KEYS
similarity index 100%
rename from KEYS
rename to qpid/KEYS
diff --git a/LICENSE b/qpid/LICENSE
similarity index 100%
rename from LICENSE
rename to qpid/LICENSE
diff --git a/NOTICE b/qpid/NOTICE
similarity index 100%
rename from NOTICE
rename to qpid/NOTICE
diff --git a/QPID_VERSION.txt b/qpid/QPID_VERSION.txt
similarity index 100%
rename from QPID_VERSION.txt
rename to qpid/QPID_VERSION.txt
diff --git a/README.txt b/qpid/README.txt
similarity index 100%
rename from README.txt
rename to qpid/README.txt
diff --git a/bin/LICENSE b/qpid/bin/LICENSE
similarity index 100%
rename from bin/LICENSE
rename to qpid/bin/LICENSE
diff --git a/bin/NOTICE b/qpid/bin/NOTICE
similarity index 100%
rename from bin/NOTICE
rename to qpid/bin/NOTICE
diff --git a/bin/mvn-deploy-qpid-java.sh b/qpid/bin/mvn-deploy-qpid-java.sh
similarity index 100%
rename from bin/mvn-deploy-qpid-java.sh
rename to qpid/bin/mvn-deploy-qpid-java.sh
diff --git a/bin/release.sh b/qpid/bin/release.sh
similarity index 100%
rename from bin/release.sh
rename to qpid/bin/release.sh
diff --git a/bin/set_svn_properties.sh b/qpid/bin/set_svn_properties.sh
similarity index 100%
rename from bin/set_svn_properties.sh
rename to qpid/bin/set_svn_properties.sh
diff --git a/buildtools/LICENSE b/qpid/buildtools/LICENSE
similarity index 100%
rename from buildtools/LICENSE
rename to qpid/buildtools/LICENSE
diff --git a/buildtools/NOTICE b/qpid/buildtools/NOTICE
similarity index 100%
rename from buildtools/NOTICE
rename to qpid/buildtools/NOTICE
diff --git a/buildtools/buildCreator/build.config b/qpid/buildtools/buildCreator/build.config
similarity index 100%
rename from buildtools/buildCreator/build.config
rename to qpid/buildtools/buildCreator/build.config
diff --git a/buildtools/buildCreator/buildCreator.py b/qpid/buildtools/buildCreator/buildCreator.py
similarity index 100%
rename from buildtools/buildCreator/buildCreator.py
rename to qpid/buildtools/buildCreator/buildCreator.py
diff --git a/buildtools/buildCreator/qpid.build b/qpid/buildtools/buildCreator/qpid.build
similarity index 100%
rename from buildtools/buildCreator/qpid.build
rename to qpid/buildtools/buildCreator/qpid.build
diff --git a/cc/LICENSE b/qpid/cc/LICENSE
similarity index 100%
rename from cc/LICENSE
rename to qpid/cc/LICENSE
diff --git a/cc/NOTICE b/qpid/cc/NOTICE
similarity index 100%
rename from cc/NOTICE
rename to qpid/cc/NOTICE
diff --git a/cc/README.txt b/qpid/cc/README.txt
similarity index 100%
rename from cc/README.txt
rename to qpid/cc/README.txt
diff --git a/cc/config.properties b/qpid/cc/config.properties
similarity index 100%
rename from cc/config.properties
rename to qpid/cc/config.properties
diff --git a/cc/config.xml b/qpid/cc/config.xml
similarity index 100%
rename from cc/config.xml
rename to qpid/cc/config.xml
diff --git a/cc/config/bdbstore-cpp-trunk.xml b/qpid/cc/config/bdbstore-cpp-trunk.xml
similarity index 100%
rename from cc/config/bdbstore-cpp-trunk.xml
rename to qpid/cc/config/bdbstore-cpp-trunk.xml
diff --git a/cc/config/cpp-perftests.xml b/qpid/cc/config/cpp-perftests.xml
similarity index 100%
rename from cc/config/cpp-perftests.xml
rename to qpid/cc/config/cpp-perftests.xml
diff --git a/cc/config/cpp-trunk.xml b/qpid/cc/config/cpp-trunk.xml
similarity index 100%
rename from cc/config/cpp-trunk.xml
rename to qpid/cc/config/cpp-trunk.xml
diff --git a/cc/config/dotnet-trunk.xml b/qpid/cc/config/dotnet-trunk.xml
similarity index 100%
rename from cc/config/dotnet-trunk.xml
rename to qpid/cc/config/dotnet-trunk.xml
diff --git a/cc/config/example-automation.xml b/qpid/cc/config/example-automation.xml
similarity index 100%
rename from cc/config/example-automation.xml
rename to qpid/cc/config/example-automation.xml
diff --git a/cc/config/java-jmstck.xml b/qpid/cc/config/java-jmstck.xml
similarity index 100%
rename from cc/config/java-jmstck.xml
rename to qpid/cc/config/java-jmstck.xml
diff --git a/cc/config/java-perftests.xml b/qpid/cc/config/java-perftests.xml
similarity index 100%
rename from cc/config/java-perftests.xml
rename to qpid/cc/config/java-perftests.xml
diff --git a/cc/config/java-trunk.xml b/qpid/cc/config/java-trunk.xml
similarity index 100%
rename from cc/config/java-trunk.xml
rename to qpid/cc/config/java-trunk.xml
diff --git a/cc/config/java/cpp.noprefetch.testprofile b/qpid/cc/config/java/cpp.noprefetch.testprofile
similarity index 100%
rename from cc/config/java/cpp.noprefetch.testprofile
rename to qpid/cc/config/java/cpp.noprefetch.testprofile
diff --git a/cc/config/java/cpp.testprofile b/qpid/cc/config/java/cpp.testprofile
similarity index 100%
rename from cc/config/java/cpp.testprofile
rename to qpid/cc/config/java/cpp.testprofile
diff --git a/cc/config/java/jndi.properties b/qpid/cc/config/java/jndi.properties
similarity index 100%
rename from cc/config/java/jndi.properties
rename to qpid/cc/config/java/jndi.properties
diff --git a/cc/dashboard-config.xml b/qpid/cc/dashboard-config.xml
similarity index 100%
rename from cc/dashboard-config.xml
rename to qpid/cc/dashboard-config.xml
diff --git a/cc/scripts/bdbstorecppbuild.sh b/qpid/cc/scripts/bdbstorecppbuild.sh
similarity index 100%
rename from cc/scripts/bdbstorecppbuild.sh
rename to qpid/cc/scripts/bdbstorecppbuild.sh
diff --git a/cc/scripts/build.xml b/qpid/cc/scripts/build.xml
similarity index 100%
rename from cc/scripts/build.xml
rename to qpid/cc/scripts/build.xml
diff --git a/cc/scripts/check_examples.sh b/qpid/cc/scripts/check_examples.sh
similarity index 100%
rename from cc/scripts/check_examples.sh
rename to qpid/cc/scripts/check_examples.sh
diff --git a/cc/scripts/cppbuild-perftests.sh b/qpid/cc/scripts/cppbuild-perftests.sh
similarity index 100%
rename from cc/scripts/cppbuild-perftests.sh
rename to qpid/cc/scripts/cppbuild-perftests.sh
diff --git a/cc/scripts/cppbuild.sh b/qpid/cc/scripts/cppbuild.sh
similarity index 100%
rename from cc/scripts/cppbuild.sh
rename to qpid/cc/scripts/cppbuild.sh
diff --git a/cc/scripts/dotnetbuild.sh b/qpid/cc/scripts/dotnetbuild.sh
similarity index 100%
rename from cc/scripts/dotnetbuild.sh
rename to qpid/cc/scripts/dotnetbuild.sh
diff --git a/cc/scripts/javaconfig.sh b/qpid/cc/scripts/javaconfig.sh
similarity index 100%
rename from cc/scripts/javaconfig.sh
rename to qpid/cc/scripts/javaconfig.sh
diff --git a/cc/scripts/javajmstck.sh b/qpid/cc/scripts/javajmstck.sh
similarity index 100%
rename from cc/scripts/javajmstck.sh
rename to qpid/cc/scripts/javajmstck.sh
diff --git a/cc/scripts/javareport.sh b/qpid/cc/scripts/javareport.sh
similarity index 100%
rename from cc/scripts/javareport.sh
rename to qpid/cc/scripts/javareport.sh
diff --git a/cc/scripts/runbroker.sh b/qpid/cc/scripts/runbroker.sh
similarity index 100%
rename from cc/scripts/runbroker.sh
rename to qpid/cc/scripts/runbroker.sh
diff --git a/cc/scripts/stopbroker.sh b/qpid/cc/scripts/stopbroker.sh
similarity index 100%
rename from cc/scripts/stopbroker.sh
rename to qpid/cc/scripts/stopbroker.sh
diff --git a/cc/scripts/verify b/qpid/cc/scripts/verify
similarity index 100%
rename from cc/scripts/verify
rename to qpid/cc/scripts/verify
diff --git a/cc/scripts/verify_all b/qpid/cc/scripts/verify_all
similarity index 100%
rename from cc/scripts/verify_all
rename to qpid/cc/scripts/verify_all
diff --git a/cpp/.gitignore b/qpid/cpp/.gitignore
similarity index 100%
rename from cpp/.gitignore
rename to qpid/cpp/.gitignore
diff --git a/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake
similarity index 100%
rename from cpp/BuildInstallSettings.cmake
rename to qpid/cpp/BuildInstallSettings.cmake
diff --git a/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt
similarity index 100%
rename from cpp/CMakeLists.txt
rename to qpid/cpp/CMakeLists.txt
diff --git a/cpp/CTestConfig.cmake b/qpid/cpp/CTestConfig.cmake
similarity index 100%
rename from cpp/CTestConfig.cmake
rename to qpid/cpp/CTestConfig.cmake
diff --git a/cpp/DESIGN b/qpid/cpp/DESIGN
similarity index 100%
rename from cpp/DESIGN
rename to qpid/cpp/DESIGN
diff --git a/cpp/INSTALL b/qpid/cpp/INSTALL
similarity index 100%
rename from cpp/INSTALL
rename to qpid/cpp/INSTALL
diff --git a/cpp/INSTALL-WINDOWS b/qpid/cpp/INSTALL-WINDOWS
similarity index 100%
rename from cpp/INSTALL-WINDOWS
rename to qpid/cpp/INSTALL-WINDOWS
diff --git a/cpp/LICENSE b/qpid/cpp/LICENSE
similarity index 100%
rename from cpp/LICENSE
rename to qpid/cpp/LICENSE
diff --git a/cpp/Makefile.am b/qpid/cpp/Makefile.am
similarity index 100%
rename from cpp/Makefile.am
rename to qpid/cpp/Makefile.am
diff --git a/cpp/NOTICE b/qpid/cpp/NOTICE
similarity index 100%
rename from cpp/NOTICE
rename to qpid/cpp/NOTICE
diff --git a/cpp/README-winsdk.txt b/qpid/cpp/README-winsdk.txt
similarity index 100%
rename from cpp/README-winsdk.txt
rename to qpid/cpp/README-winsdk.txt
diff --git a/cpp/README.txt b/qpid/cpp/README.txt
similarity index 100%
rename from cpp/README.txt
rename to qpid/cpp/README.txt
diff --git a/cpp/RELEASE_NOTES b/qpid/cpp/RELEASE_NOTES
similarity index 100%
rename from cpp/RELEASE_NOTES
rename to qpid/cpp/RELEASE_NOTES
diff --git a/cpp/SSL b/qpid/cpp/SSL
similarity index 100%
rename from cpp/SSL
rename to qpid/cpp/SSL
diff --git a/cpp/bindings/qmf/Makefile.am b/qpid/cpp/bindings/qmf/Makefile.am
similarity index 100%
rename from cpp/bindings/qmf/Makefile.am
rename to qpid/cpp/bindings/qmf/Makefile.am
diff --git a/cpp/bindings/qmf/python/Makefile.am b/qpid/cpp/bindings/qmf/python/Makefile.am
similarity index 89%
rename from cpp/bindings/qmf/python/Makefile.am
rename to qpid/cpp/bindings/qmf/python/Makefile.am
index 421590f..8abad329 100644
--- a/cpp/bindings/qmf/python/Makefile.am
+++ b/qpid/cpp/bindings/qmf/python/Makefile.am
@@ -30,11 +30,13 @@
 SWIG_FLAGS = -w362,401
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
-	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
+	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
 lib_LTLIBRARIES = _qmfengine.la
+qenginedir = $(pyexecdir)
+qengine_PYTHON = qmfengine.py qmf.py
 
 #_qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
 #_qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".so"
diff --git a/cpp/bindings/qmf/python/python.i b/qpid/cpp/bindings/qmf/python/python.i
similarity index 100%
rename from cpp/bindings/qmf/python/python.i
rename to qpid/cpp/bindings/qmf/python/python.i
diff --git a/cpp/bindings/qmf/python/qmf.py b/qpid/cpp/bindings/qmf/python/qmf.py
similarity index 100%
rename from cpp/bindings/qmf/python/qmf.py
rename to qpid/cpp/bindings/qmf/python/qmf.py
diff --git a/cpp/bindings/qmf/qmfengine.i b/qpid/cpp/bindings/qmf/qmfengine.i
similarity index 100%
rename from cpp/bindings/qmf/qmfengine.i
rename to qpid/cpp/bindings/qmf/qmfengine.i
diff --git a/cpp/bindings/qmf/ruby/Makefile.am b/qpid/cpp/bindings/qmf/ruby/Makefile.am
similarity index 94%
rename from cpp/bindings/qmf/ruby/Makefile.am
rename to qpid/cpp/bindings/qmf/ruby/Makefile.am
index 395d64f..de8c4d1 100644
--- a/cpp/bindings/qmf/ruby/Makefile.am
+++ b/qpid/cpp/bindings/qmf/ruby/Makefile.am
@@ -35,7 +35,7 @@
 rubylibarchdir = $(RUBY_LIB_ARCH)
 rubylibarch_LTLIBRARIES = qmfengine.la
 
-qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
+qmfengine_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
 qmfengine_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfengine.la
 qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
 nodist_qmfengine_la_SOURCES = qmfengine.cpp
diff --git a/cpp/bindings/qmf/ruby/qmf.rb b/qpid/cpp/bindings/qmf/ruby/qmf.rb
similarity index 100%
rename from cpp/bindings/qmf/ruby/qmf.rb
rename to qpid/cpp/bindings/qmf/ruby/qmf.rb
diff --git a/cpp/bindings/qmf/ruby/ruby.i b/qpid/cpp/bindings/qmf/ruby/ruby.i
similarity index 100%
rename from cpp/bindings/qmf/ruby/ruby.i
rename to qpid/cpp/bindings/qmf/ruby/ruby.i
diff --git a/cpp/bindings/qmf/tests/Makefile.am b/qpid/cpp/bindings/qmf/tests/Makefile.am
similarity index 100%
rename from cpp/bindings/qmf/tests/Makefile.am
rename to qpid/cpp/bindings/qmf/tests/Makefile.am
diff --git a/cpp/bindings/qmf/tests/agent_ruby.rb b/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
similarity index 100%
rename from cpp/bindings/qmf/tests/agent_ruby.rb
rename to qpid/cpp/bindings/qmf/tests/agent_ruby.rb
diff --git a/cpp/bindings/qmf/tests/python_agent.py b/qpid/cpp/bindings/qmf/tests/python_agent.py
similarity index 100%
rename from cpp/bindings/qmf/tests/python_agent.py
rename to qpid/cpp/bindings/qmf/tests/python_agent.py
diff --git a/cpp/bindings/qmf/tests/python_console.py b/qpid/cpp/bindings/qmf/tests/python_console.py
similarity index 100%
rename from cpp/bindings/qmf/tests/python_console.py
rename to qpid/cpp/bindings/qmf/tests/python_console.py
diff --git a/cpp/bindings/qmf/tests/ruby_console.rb b/qpid/cpp/bindings/qmf/tests/ruby_console.rb
similarity index 100%
rename from cpp/bindings/qmf/tests/ruby_console.rb
rename to qpid/cpp/bindings/qmf/tests/ruby_console.rb
diff --git a/cpp/bindings/qmf/tests/ruby_console_test.rb b/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
similarity index 100%
rename from cpp/bindings/qmf/tests/ruby_console_test.rb
rename to qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
diff --git a/cpp/bindings/qmf/tests/run_interop_tests b/qpid/cpp/bindings/qmf/tests/run_interop_tests
similarity index 100%
rename from cpp/bindings/qmf/tests/run_interop_tests
rename to qpid/cpp/bindings/qmf/tests/run_interop_tests
diff --git a/cpp/bindings/qmf/tests/test_base.rb b/qpid/cpp/bindings/qmf/tests/test_base.rb
similarity index 100%
rename from cpp/bindings/qmf/tests/test_base.rb
rename to qpid/cpp/bindings/qmf/tests/test_base.rb
diff --git a/cpp/bindings/qmf2/Makefile.am b/qpid/cpp/bindings/qmf2/Makefile.am
similarity index 100%
rename from cpp/bindings/qmf2/Makefile.am
rename to qpid/cpp/bindings/qmf2/Makefile.am
diff --git a/cpp/bindings/qmf2/examples/cpp/Makefile.am b/qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
similarity index 100%
rename from cpp/bindings/qmf2/examples/cpp/Makefile.am
rename to qpid/cpp/bindings/qmf2/examples/cpp/Makefile.am
diff --git a/cpp/bindings/qmf2/examples/cpp/agent.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
similarity index 100%
rename from cpp/bindings/qmf2/examples/cpp/agent.cpp
rename to qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
similarity index 100%
rename from cpp/bindings/qmf2/examples/cpp/list_agents.cpp
rename to qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/print_events.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
similarity index 100%
rename from cpp/bindings/qmf2/examples/cpp/print_events.cpp
rename to qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
diff --git a/cpp/bindings/qmf2/examples/python/agent.py b/qpid/cpp/bindings/qmf2/examples/python/agent.py
similarity index 100%
rename from cpp/bindings/qmf2/examples/python/agent.py
rename to qpid/cpp/bindings/qmf2/examples/python/agent.py
diff --git a/cpp/bindings/qmf2/examples/python/find_agents.py b/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
similarity index 100%
rename from cpp/bindings/qmf2/examples/python/find_agents.py
rename to qpid/cpp/bindings/qmf2/examples/python/find_agents.py
diff --git a/cpp/bindings/qmf2/examples/ruby/agent_external.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
similarity index 100%
rename from cpp/bindings/qmf2/examples/ruby/agent_external.rb
rename to qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
diff --git a/cpp/bindings/qmf2/examples/ruby/agent_internal.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
similarity index 100%
rename from cpp/bindings/qmf2/examples/ruby/agent_internal.rb
rename to qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
diff --git a/cpp/bindings/qmf2/examples/ruby/find_agents.rb b/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
similarity index 100%
rename from cpp/bindings/qmf2/examples/ruby/find_agents.rb
rename to qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
diff --git a/cpp/bindings/qmf2/python/Makefile.am b/qpid/cpp/bindings/qmf2/python/Makefile.am
similarity index 91%
rename from cpp/bindings/qmf2/python/Makefile.am
rename to qpid/cpp/bindings/qmf2/python/Makefile.am
index 7adc62e..3dc04e8 100644
--- a/cpp/bindings/qmf2/python/Makefile.am
+++ b/qpid/cpp/bindings/qmf2/python/Makefile.am
@@ -30,12 +30,12 @@
 SWIG_FLAGS = -w362,401
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmf2.i $(srcdir)/../../swig_python_typemaps.i
-	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
+	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o cqmf2.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
 lib_LTLIBRARIES = _cqmf2.la
-cqpiddir = $(pythondir)
+cqpiddir = $(pyexecdir)
 cqpid_PYTHON = qmf2.py cqmf2.py
 
 _cqmf2_la_LDFLAGS = -avoid-version -module -shared
diff --git a/cpp/bindings/qmf2/python/python.i b/qpid/cpp/bindings/qmf2/python/python.i
similarity index 100%
rename from cpp/bindings/qmf2/python/python.i
rename to qpid/cpp/bindings/qmf2/python/python.i
diff --git a/cpp/bindings/qmf2/python/qmf2.py b/qpid/cpp/bindings/qmf2/python/qmf2.py
similarity index 100%
rename from cpp/bindings/qmf2/python/qmf2.py
rename to qpid/cpp/bindings/qmf2/python/qmf2.py
diff --git a/cpp/bindings/qmf2/qmf2.i b/qpid/cpp/bindings/qmf2/qmf2.i
similarity index 100%
rename from cpp/bindings/qmf2/qmf2.i
rename to qpid/cpp/bindings/qmf2/qmf2.i
diff --git a/cpp/bindings/qmf2/ruby/Makefile.am b/qpid/cpp/bindings/qmf2/ruby/Makefile.am
similarity index 95%
rename from cpp/bindings/qmf2/ruby/Makefile.am
rename to qpid/cpp/bindings/qmf2/ruby/Makefile.am
index 8e11a20..97bbc6f 100644
--- a/cpp/bindings/qmf2/ruby/Makefile.am
+++ b/qpid/cpp/bindings/qmf2/ruby/Makefile.am
@@ -34,7 +34,7 @@
 rubylibarch_LTLIBRARIES = cqmf2.la
 dist_rubylib_DATA = qmf2.rb
 
-cqmf2_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
+cqmf2_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
 cqmf2_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqmf2 $(top_builddir)/src/libqmf2.la
 cqmf2_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
 nodist_cqmf2_la_SOURCES = cqmf2.cpp
diff --git a/cpp/bindings/qmf2/ruby/qmf2.rb b/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
similarity index 100%
rename from cpp/bindings/qmf2/ruby/qmf2.rb
rename to qpid/cpp/bindings/qmf2/ruby/qmf2.rb
diff --git a/cpp/bindings/qmf2/ruby/ruby.i b/qpid/cpp/bindings/qmf2/ruby/ruby.i
similarity index 100%
rename from cpp/bindings/qmf2/ruby/ruby.i
rename to qpid/cpp/bindings/qmf2/ruby/ruby.i
diff --git a/cpp/bindings/qpid/CMakeLists.txt b/qpid/cpp/bindings/qpid/CMakeLists.txt
similarity index 100%
rename from cpp/bindings/qpid/CMakeLists.txt
rename to qpid/cpp/bindings/qpid/CMakeLists.txt
diff --git a/cpp/bindings/qpid/Makefile.am b/qpid/cpp/bindings/qpid/Makefile.am
similarity index 100%
rename from cpp/bindings/qpid/Makefile.am
rename to qpid/cpp/bindings/qpid/Makefile.am
diff --git a/cpp/bindings/qpid/dotnet/Makefile.am b/qpid/cpp/bindings/qpid/dotnet/Makefile.am
similarity index 100%
rename from cpp/bindings/qpid/dotnet/Makefile.am
rename to qpid/cpp/bindings/qpid/dotnet/Makefile.am
diff --git a/cpp/bindings/qpid/dotnet/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
similarity index 100%
rename from cpp/bindings/qpid/dotnet/ReadMe.txt
rename to qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
diff --git a/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
similarity index 100%
rename from cpp/bindings/qpid/dotnet/configure-windows.ps1
rename to qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1 b/qpid/cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1
rename to qpid/cpp/bindings/qpid/dotnet/examples/powershell.example.helloworld/powershell.example.helloworld.ps1
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.Designer.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Application.myapp
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.Designer.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Resources.resx
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.Designer.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/Settings.settings
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vb
diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj b/qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj
rename to qpid/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/visualbasic.example.client.vbproj
diff --git a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln b/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
similarity index 100%
rename from cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
rename to qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
diff --git a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln b/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln
similarity index 100%
rename from cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln
rename to qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sln
diff --git a/cpp/bindings/qpid/dotnet/src/Address.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Address.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Address.h b/qpid/cpp/bindings/qpid/dotnet/src/Address.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Address.h
rename to qpid/cpp/bindings/qpid/dotnet/src/Address.h
diff --git a/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Connection.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.h b/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Connection.h
rename to qpid/cpp/bindings/qpid/dotnet/src/Connection.h
diff --git a/cpp/bindings/qpid/dotnet/src/Duration.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Duration.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Duration.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/Duration.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Duration.h b/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Duration.h
rename to qpid/cpp/bindings/qpid/dotnet/src/Duration.h
diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
rename to qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
diff --git a/cpp/bindings/qpid/dotnet/src/Message.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Message.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Message.h b/qpid/cpp/bindings/qpid/dotnet/src/Message.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Message.h
rename to qpid/cpp/bindings/qpid/dotnet/src/Message.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidException.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/QpidException.h
rename to qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidMarshal.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/QpidMarshal.h
rename to qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
rename to qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
diff --git a/cpp/bindings/qpid/dotnet/src/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/ReadMe.txt
rename to qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Receiver.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.h b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Receiver.h
rename to qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
diff --git a/cpp/bindings/qpid/dotnet/src/Sender.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Sender.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Sender.h b/qpid/cpp/bindings/qpid/dotnet/src/Sender.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Sender.h
rename to qpid/cpp/bindings/qpid/dotnet/src/Sender.h
diff --git a/cpp/bindings/qpid/dotnet/src/Session.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Session.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Session.h b/qpid/cpp/bindings/qpid/dotnet/src/Session.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/Session.h
rename to qpid/cpp/bindings/qpid/dotnet/src/Session.h
diff --git a/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
rename to qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/TypeTranslator.h b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/TypeTranslator.h
rename to qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
diff --git a/cpp/bindings/qpid/dotnet/src/app.rc b/qpid/cpp/bindings/qpid/dotnet/src/app.rc
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/app.rc
rename to qpid/cpp/bindings/qpid/dotnet/src/app.rc
diff --git a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
rename to qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
diff --git a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
rename to qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
diff --git a/cpp/bindings/qpid/dotnet/src/qpid.snk b/qpid/cpp/bindings/qpid/dotnet/src/qpid.snk
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/qpid.snk
rename to qpid/cpp/bindings/qpid/dotnet/src/qpid.snk
Binary files differ
diff --git a/cpp/bindings/qpid/dotnet/src/resource1.h b/qpid/cpp/bindings/qpid/dotnet/src/resource1.h
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/resource1.h
rename to qpid/cpp/bindings/qpid/dotnet/src/resource1.h
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
rename to qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj
rename to qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/org.apache.qpid.messaging.sessionreceiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
rename to qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
Binary files differ
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
rename to qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
rename to qpid/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
rename to qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
rename to qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
rename to qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.csproj b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.csproj
rename to qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.csproj
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
rename to qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
similarity index 100%
rename from cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
rename to qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.direct.sender/csharp.direct.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.client/csharp.example.client.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.drain/csharp.example.drain.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.server/csharp.example.server.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.example.spout/csharp.example.spout.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.receiver/csharp.map.receiver.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/examples/csharp.map.sender/csharp.map.sender.csproj
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln
similarity index 100%
rename from cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln
rename to qpid/cpp/bindings/qpid/dotnet/winsdk_sources/winsdk_dotnet_examples.sln
diff --git a/cpp/bindings/qpid/examples/perl/README b/qpid/cpp/bindings/qpid/examples/perl/README
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/README
rename to qpid/cpp/bindings/qpid/examples/perl/README
diff --git a/cpp/bindings/qpid/examples/perl/client.pl b/qpid/cpp/bindings/qpid/examples/perl/client.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/client.pl
rename to qpid/cpp/bindings/qpid/examples/perl/client.pl
diff --git a/cpp/bindings/qpid/examples/perl/drain.pl b/qpid/cpp/bindings/qpid/examples/perl/drain.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/drain.pl
rename to qpid/cpp/bindings/qpid/examples/perl/drain.pl
diff --git a/cpp/bindings/qpid/examples/perl/hello_world.pl b/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/hello_world.pl
rename to qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
diff --git a/cpp/bindings/qpid/examples/perl/hello_xml.pl b/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/hello_xml.pl
rename to qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
diff --git a/cpp/bindings/qpid/examples/perl/map_receiver.pl b/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/map_receiver.pl
rename to qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
diff --git a/cpp/bindings/qpid/examples/perl/map_sender.pl b/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/map_sender.pl
rename to qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
diff --git a/cpp/bindings/qpid/examples/perl/server.pl b/qpid/cpp/bindings/qpid/examples/perl/server.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/server.pl
rename to qpid/cpp/bindings/qpid/examples/perl/server.pl
diff --git a/cpp/bindings/qpid/examples/perl/spout.pl b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
similarity index 100%
rename from cpp/bindings/qpid/examples/perl/spout.pl
rename to qpid/cpp/bindings/qpid/examples/perl/spout.pl
diff --git a/cpp/bindings/qpid/perl/CMakeLists.txt b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
similarity index 100%
rename from cpp/bindings/qpid/perl/CMakeLists.txt
rename to qpid/cpp/bindings/qpid/perl/CMakeLists.txt
diff --git a/cpp/bindings/qpid/perl/Makefile.am b/qpid/cpp/bindings/qpid/perl/Makefile.am
similarity index 100%
rename from cpp/bindings/qpid/perl/Makefile.am
rename to qpid/cpp/bindings/qpid/perl/Makefile.am
diff --git a/cpp/bindings/qpid/perl/perl.i b/qpid/cpp/bindings/qpid/perl/perl.i
similarity index 100%
rename from cpp/bindings/qpid/perl/perl.i
rename to qpid/cpp/bindings/qpid/perl/perl.i
diff --git a/cpp/bindings/qpid/python/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
similarity index 100%
rename from cpp/bindings/qpid/python/CMakeLists.txt
rename to qpid/cpp/bindings/qpid/python/CMakeLists.txt
diff --git a/cpp/bindings/qpid/python/Makefile.am b/qpid/cpp/bindings/qpid/python/Makefile.am
similarity index 90%
rename from cpp/bindings/qpid/python/Makefile.am
rename to qpid/cpp/bindings/qpid/python/Makefile.am
index 9aef179..dd25f34 100644
--- a/cpp/bindings/qpid/python/Makefile.am
+++ b/qpid/cpp/bindings/qpid/python/Makefile.am
@@ -30,12 +30,12 @@
 SWIG_FLAGS = -w362,401
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i
-	swig -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
+	$(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
 lib_LTLIBRARIES = _cqpid.la
-cqpiddir = $(pythondir)
+cqpiddir = $(pyexecdir)
 cqpid_PYTHON = cqpid.py
 
 _cqpid_la_LDFLAGS = -avoid-version -module -shared
diff --git a/cpp/bindings/qpid/python/python.i b/qpid/cpp/bindings/qpid/python/python.i
similarity index 100%
rename from cpp/bindings/qpid/python/python.i
rename to qpid/cpp/bindings/qpid/python/python.i
diff --git a/cpp/bindings/qpid/qpid.i b/qpid/cpp/bindings/qpid/qpid.i
similarity index 100%
rename from cpp/bindings/qpid/qpid.i
rename to qpid/cpp/bindings/qpid/qpid.i
diff --git a/cpp/bindings/qpid/ruby/CMakeLists.txt b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
similarity index 100%
rename from cpp/bindings/qpid/ruby/CMakeLists.txt
rename to qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
diff --git a/cpp/bindings/qpid/ruby/Makefile.am b/qpid/cpp/bindings/qpid/ruby/Makefile.am
similarity index 95%
rename from cpp/bindings/qpid/ruby/Makefile.am
rename to qpid/cpp/bindings/qpid/ruby/Makefile.am
index d92eb96..a2a5dd7 100644
--- a/cpp/bindings/qpid/ruby/Makefile.am
+++ b/qpid/cpp/bindings/qpid/ruby/Makefile.am
@@ -33,7 +33,7 @@
 rubylibarchdir = $(RUBY_LIB_ARCH)
 rubylibarch_LTLIBRARIES = cqpid.la
 
-cqpid_la_LDFLAGS = -avoid-version -module -shrext ".$(RUBY_DLEXT)"
+cqpid_la_LDFLAGS = -avoid-version -module -shared -shrext ".$(RUBY_DLEXT)"
 cqpid_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lqpidmessaging -lqpidtypes \
 	$(top_builddir)/src/libqpidmessaging.la $(top_builddir)/src/libqpidtypes.la
 cqpid_la_CXXFLAGS = $(INCLUDES) -I$(RUBY_INC) -I$(RUBY_INC_ARCH) -fno-strict-aliasing
diff --git a/cpp/bindings/qpid/ruby/ruby.i b/qpid/cpp/bindings/qpid/ruby/ruby.i
similarity index 100%
rename from cpp/bindings/qpid/ruby/ruby.i
rename to qpid/cpp/bindings/qpid/ruby/ruby.i
diff --git a/cpp/bindings/swig_perl_typemaps.i b/qpid/cpp/bindings/swig_perl_typemaps.i
similarity index 100%
rename from cpp/bindings/swig_perl_typemaps.i
rename to qpid/cpp/bindings/swig_perl_typemaps.i
diff --git a/cpp/bindings/swig_python_typemaps.i b/qpid/cpp/bindings/swig_python_typemaps.i
similarity index 100%
rename from cpp/bindings/swig_python_typemaps.i
rename to qpid/cpp/bindings/swig_python_typemaps.i
diff --git a/cpp/bindings/swig_ruby_typemaps.i b/qpid/cpp/bindings/swig_ruby_typemaps.i
similarity index 100%
rename from cpp/bindings/swig_ruby_typemaps.i
rename to qpid/cpp/bindings/swig_ruby_typemaps.i
diff --git a/cpp/bld-winsdk.ps1 b/qpid/cpp/bld-winsdk.ps1
similarity index 100%
rename from cpp/bld-winsdk.ps1
rename to qpid/cpp/bld-winsdk.ps1
diff --git a/cpp/boost-1.32-support/Makefile b/qpid/cpp/boost-1.32-support/Makefile
similarity index 100%
rename from cpp/boost-1.32-support/Makefile
rename to qpid/cpp/boost-1.32-support/Makefile
diff --git a/cpp/boost-1.32-support/README.txt b/qpid/cpp/boost-1.32-support/README.txt
similarity index 100%
rename from cpp/boost-1.32-support/README.txt
rename to qpid/cpp/boost-1.32-support/README.txt
diff --git a/cpp/boost-1.32-support/boost.tar.gz b/qpid/cpp/boost-1.32-support/boost.tar.gz
similarity index 100%
rename from cpp/boost-1.32-support/boost.tar.gz
rename to qpid/cpp/boost-1.32-support/boost.tar.gz
Binary files differ
diff --git a/cpp/boost-1.32-support/main.patch b/qpid/cpp/boost-1.32-support/main.patch
similarity index 100%
rename from cpp/boost-1.32-support/main.patch
rename to qpid/cpp/boost-1.32-support/main.patch
diff --git a/cpp/boost-1.32-support/supressions b/qpid/cpp/boost-1.32-support/supressions
similarity index 100%
rename from cpp/boost-1.32-support/supressions
rename to qpid/cpp/boost-1.32-support/supressions
diff --git a/cpp/bootstrap b/qpid/cpp/bootstrap
similarity index 100%
rename from cpp/bootstrap
rename to qpid/cpp/bootstrap
diff --git a/cpp/build-aux/.gitignore b/qpid/cpp/build-aux/.gitignore
similarity index 100%
rename from cpp/build-aux/.gitignore
rename to qpid/cpp/build-aux/.gitignore
diff --git a/cpp/build-aux/compile b/qpid/cpp/build-aux/compile
similarity index 100%
rename from cpp/build-aux/compile
rename to qpid/cpp/build-aux/compile
diff --git a/cpp/build-aux/config.guess b/qpid/cpp/build-aux/config.guess
similarity index 100%
rename from cpp/build-aux/config.guess
rename to qpid/cpp/build-aux/config.guess
diff --git a/cpp/build-aux/config.rpath b/qpid/cpp/build-aux/config.rpath
similarity index 100%
rename from cpp/build-aux/config.rpath
rename to qpid/cpp/build-aux/config.rpath
diff --git a/cpp/build-aux/config.sub b/qpid/cpp/build-aux/config.sub
similarity index 100%
rename from cpp/build-aux/config.sub
rename to qpid/cpp/build-aux/config.sub
diff --git a/cpp/build-aux/depcomp b/qpid/cpp/build-aux/depcomp
similarity index 100%
rename from cpp/build-aux/depcomp
rename to qpid/cpp/build-aux/depcomp
diff --git a/cpp/build-aux/install-sh b/qpid/cpp/build-aux/install-sh
similarity index 100%
rename from cpp/build-aux/install-sh
rename to qpid/cpp/build-aux/install-sh
diff --git a/cpp/build-aux/mdate-sh b/qpid/cpp/build-aux/mdate-sh
similarity index 100%
rename from cpp/build-aux/mdate-sh
rename to qpid/cpp/build-aux/mdate-sh
diff --git a/cpp/build-aux/missing b/qpid/cpp/build-aux/missing
similarity index 100%
rename from cpp/build-aux/missing
rename to qpid/cpp/build-aux/missing
diff --git a/cpp/configure.ac b/qpid/cpp/configure.ac
similarity index 100%
rename from cpp/configure.ac
rename to qpid/cpp/configure.ac
diff --git a/cpp/design_docs/new-cluster-design.txt b/qpid/cpp/design_docs/new-cluster-design.txt
similarity index 100%
rename from cpp/design_docs/new-cluster-design.txt
rename to qpid/cpp/design_docs/new-cluster-design.txt
diff --git a/cpp/design_docs/new-cluster-plan.txt b/qpid/cpp/design_docs/new-cluster-plan.txt
similarity index 100%
rename from cpp/design_docs/new-cluster-plan.txt
rename to qpid/cpp/design_docs/new-cluster-plan.txt
diff --git a/cpp/design_docs/windows_clfs_store_design.txt b/qpid/cpp/design_docs/windows_clfs_store_design.txt
similarity index 100%
rename from cpp/design_docs/windows_clfs_store_design.txt
rename to qpid/cpp/design_docs/windows_clfs_store_design.txt
diff --git a/cpp/docs/api/CMakeLists.txt b/qpid/cpp/docs/api/CMakeLists.txt
similarity index 100%
rename from cpp/docs/api/CMakeLists.txt
rename to qpid/cpp/docs/api/CMakeLists.txt
diff --git a/cpp/docs/api/Makefile.am b/qpid/cpp/docs/api/Makefile.am
similarity index 100%
rename from cpp/docs/api/Makefile.am
rename to qpid/cpp/docs/api/Makefile.am
diff --git a/cpp/docs/api/developer.doxygen.in b/qpid/cpp/docs/api/developer.doxygen.in
similarity index 100%
rename from cpp/docs/api/developer.doxygen.in
rename to qpid/cpp/docs/api/developer.doxygen.in
diff --git a/cpp/docs/api/doxygen.css b/qpid/cpp/docs/api/doxygen.css
similarity index 100%
rename from cpp/docs/api/doxygen.css
rename to qpid/cpp/docs/api/doxygen.css
diff --git a/cpp/docs/api/doxygen_developer_mainpage.h b/qpid/cpp/docs/api/doxygen_developer_mainpage.h
similarity index 100%
rename from cpp/docs/api/doxygen_developer_mainpage.h
rename to qpid/cpp/docs/api/doxygen_developer_mainpage.h
diff --git a/cpp/docs/api/doxygen_mainpage.h b/qpid/cpp/docs/api/doxygen_mainpage.h
similarity index 100%
rename from cpp/docs/api/doxygen_mainpage.h
rename to qpid/cpp/docs/api/doxygen_mainpage.h
diff --git a/cpp/docs/api/footer.html b/qpid/cpp/docs/api/footer.html
similarity index 100%
rename from cpp/docs/api/footer.html
rename to qpid/cpp/docs/api/footer.html
diff --git a/cpp/docs/api/header.html b/qpid/cpp/docs/api/header.html
similarity index 100%
rename from cpp/docs/api/header.html
rename to qpid/cpp/docs/api/header.html
diff --git a/cpp/docs/api/stylesheet.css b/qpid/cpp/docs/api/stylesheet.css
similarity index 100%
rename from cpp/docs/api/stylesheet.css
rename to qpid/cpp/docs/api/stylesheet.css
diff --git a/cpp/docs/api/tabs.css b/qpid/cpp/docs/api/tabs.css
similarity index 100%
rename from cpp/docs/api/tabs.css
rename to qpid/cpp/docs/api/tabs.css
diff --git a/cpp/docs/api/user.doxygen.in b/qpid/cpp/docs/api/user.doxygen.in
similarity index 100%
rename from cpp/docs/api/user.doxygen.in
rename to qpid/cpp/docs/api/user.doxygen.in
diff --git a/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am
similarity index 100%
rename from cpp/docs/man/Makefile.am
rename to qpid/cpp/docs/man/Makefile.am
diff --git a/cpp/docs/man/generate_manpage b/qpid/cpp/docs/man/generate_manpage
similarity index 100%
rename from cpp/docs/man/generate_manpage
rename to qpid/cpp/docs/man/generate_manpage
diff --git a/cpp/docs/man/groffify_options.sed b/qpid/cpp/docs/man/groffify_options.sed
similarity index 100%
rename from cpp/docs/man/groffify_options.sed
rename to qpid/cpp/docs/man/groffify_options.sed
diff --git a/cpp/docs/man/groffify_template.sed b/qpid/cpp/docs/man/groffify_template.sed
similarity index 100%
rename from cpp/docs/man/groffify_template.sed
rename to qpid/cpp/docs/man/groffify_template.sed
diff --git a/cpp/docs/man/qpidd.1 b/qpid/cpp/docs/man/qpidd.1
similarity index 100%
rename from cpp/docs/man/qpidd.1
rename to qpid/cpp/docs/man/qpidd.1
diff --git a/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x
similarity index 100%
rename from cpp/docs/man/qpidd.x
rename to qpid/cpp/docs/man/qpidd.x
diff --git a/cpp/docs/src/CONTENTS b/qpid/cpp/docs/src/CONTENTS
similarity index 100%
rename from cpp/docs/src/CONTENTS
rename to qpid/cpp/docs/src/CONTENTS
diff --git a/cpp/docs/src/DispatchHandle.odg b/qpid/cpp/docs/src/DispatchHandle.odg
similarity index 100%
rename from cpp/docs/src/DispatchHandle.odg
rename to qpid/cpp/docs/src/DispatchHandle.odg
Binary files differ
diff --git a/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
similarity index 100%
rename from cpp/etc/CMakeLists.txt
rename to qpid/cpp/etc/CMakeLists.txt
diff --git a/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am
similarity index 100%
rename from cpp/etc/Makefile.am
rename to qpid/cpp/etc/Makefile.am
diff --git a/cpp/etc/emacs/qpid-c++-mode.el b/qpid/cpp/etc/emacs/qpid-c++-mode.el
similarity index 100%
rename from cpp/etc/emacs/qpid-c++-mode.el
rename to qpid/cpp/etc/emacs/qpid-c++-mode.el
diff --git a/cpp/etc/qpidc.conf b/qpid/cpp/etc/qpidc.conf
similarity index 100%
rename from cpp/etc/qpidc.conf
rename to qpid/cpp/etc/qpidc.conf
diff --git a/cpp/etc/qpidd b/qpid/cpp/etc/qpidd
similarity index 100%
rename from cpp/etc/qpidd
rename to qpid/cpp/etc/qpidd
diff --git a/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf
similarity index 100%
rename from cpp/etc/qpidd.conf
rename to qpid/cpp/etc/qpidd.conf
diff --git a/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf
similarity index 100%
rename from cpp/etc/sasl2/qpidd.conf
rename to qpid/cpp/etc/sasl2/qpidd.conf
diff --git a/cpp/etc/selinux/.gitignore b/qpid/cpp/etc/selinux/.gitignore
similarity index 100%
rename from cpp/etc/selinux/.gitignore
rename to qpid/cpp/etc/selinux/.gitignore
diff --git a/cpp/etc/selinux/Makefile b/qpid/cpp/etc/selinux/Makefile
similarity index 100%
rename from cpp/etc/selinux/Makefile
rename to qpid/cpp/etc/selinux/Makefile
diff --git a/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te
similarity index 100%
rename from cpp/etc/selinux/qpidd.te
rename to qpid/cpp/etc/selinux/qpidd.te
diff --git a/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te
similarity index 100%
rename from cpp/etc/selinux/qpiddevel.te
rename to qpid/cpp/etc/selinux/qpiddevel.te
diff --git a/cpp/examples/CMakeLists.txt b/qpid/cpp/examples/CMakeLists.txt
similarity index 100%
rename from cpp/examples/CMakeLists.txt
rename to qpid/cpp/examples/CMakeLists.txt
diff --git a/cpp/examples/Makefile.am b/qpid/cpp/examples/Makefile.am
similarity index 100%
rename from cpp/examples/Makefile.am
rename to qpid/cpp/examples/Makefile.am
diff --git a/cpp/examples/README.txt b/qpid/cpp/examples/README.txt
similarity index 100%
rename from cpp/examples/README.txt
rename to qpid/cpp/examples/README.txt
diff --git a/cpp/examples/examples.sln b/qpid/cpp/examples/examples.sln
similarity index 100%
rename from cpp/examples/examples.sln
rename to qpid/cpp/examples/examples.sln
diff --git a/cpp/examples/makedist.mk b/qpid/cpp/examples/makedist.mk
similarity index 100%
rename from cpp/examples/makedist.mk
rename to qpid/cpp/examples/makedist.mk
diff --git a/cpp/examples/messaging/CMakeLists.txt b/qpid/cpp/examples/messaging/CMakeLists.txt
similarity index 100%
rename from cpp/examples/messaging/CMakeLists.txt
rename to qpid/cpp/examples/messaging/CMakeLists.txt
diff --git a/cpp/examples/messaging/Makefile.am b/qpid/cpp/examples/messaging/Makefile.am
similarity index 100%
rename from cpp/examples/messaging/Makefile.am
rename to qpid/cpp/examples/messaging/Makefile.am
diff --git a/cpp/examples/messaging/OptionParser.cpp b/qpid/cpp/examples/messaging/OptionParser.cpp
similarity index 100%
rename from cpp/examples/messaging/OptionParser.cpp
rename to qpid/cpp/examples/messaging/OptionParser.cpp
diff --git a/cpp/examples/messaging/OptionParser.h b/qpid/cpp/examples/messaging/OptionParser.h
similarity index 100%
rename from cpp/examples/messaging/OptionParser.h
rename to qpid/cpp/examples/messaging/OptionParser.h
diff --git a/cpp/examples/messaging/client.cpp b/qpid/cpp/examples/messaging/client.cpp
similarity index 100%
rename from cpp/examples/messaging/client.cpp
rename to qpid/cpp/examples/messaging/client.cpp
diff --git a/cpp/examples/messaging/drain.cpp b/qpid/cpp/examples/messaging/drain.cpp
similarity index 100%
rename from cpp/examples/messaging/drain.cpp
rename to qpid/cpp/examples/messaging/drain.cpp
diff --git a/cpp/examples/messaging/extra_dist/Makefile b/qpid/cpp/examples/messaging/extra_dist/Makefile
similarity index 100%
rename from cpp/examples/messaging/extra_dist/Makefile
rename to qpid/cpp/examples/messaging/extra_dist/Makefile
diff --git a/cpp/examples/messaging/hello_world.cpp b/qpid/cpp/examples/messaging/hello_world.cpp
similarity index 100%
rename from cpp/examples/messaging/hello_world.cpp
rename to qpid/cpp/examples/messaging/hello_world.cpp
diff --git a/cpp/examples/messaging/hello_xml.cpp b/qpid/cpp/examples/messaging/hello_xml.cpp
similarity index 100%
rename from cpp/examples/messaging/hello_xml.cpp
rename to qpid/cpp/examples/messaging/hello_xml.cpp
diff --git a/cpp/examples/messaging/map_receiver.cpp b/qpid/cpp/examples/messaging/map_receiver.cpp
similarity index 100%
rename from cpp/examples/messaging/map_receiver.cpp
rename to qpid/cpp/examples/messaging/map_receiver.cpp
diff --git a/cpp/examples/messaging/map_sender.cpp b/qpid/cpp/examples/messaging/map_sender.cpp
similarity index 100%
rename from cpp/examples/messaging/map_sender.cpp
rename to qpid/cpp/examples/messaging/map_sender.cpp
diff --git a/cpp/examples/messaging/messaging_client.vcproj b/qpid/cpp/examples/messaging/messaging_client.vcproj
similarity index 100%
rename from cpp/examples/messaging/messaging_client.vcproj
rename to qpid/cpp/examples/messaging/messaging_client.vcproj
diff --git a/cpp/examples/messaging/messaging_drain.vcproj b/qpid/cpp/examples/messaging/messaging_drain.vcproj
similarity index 100%
rename from cpp/examples/messaging/messaging_drain.vcproj
rename to qpid/cpp/examples/messaging/messaging_drain.vcproj
diff --git a/cpp/examples/messaging/messaging_map_receiver.vcproj b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
similarity index 100%
rename from cpp/examples/messaging/messaging_map_receiver.vcproj
rename to qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
diff --git a/cpp/examples/messaging/messaging_map_sender.vcproj b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj
similarity index 100%
rename from cpp/examples/messaging/messaging_map_sender.vcproj
rename to qpid/cpp/examples/messaging/messaging_map_sender.vcproj
diff --git a/cpp/examples/messaging/messaging_server.vcproj b/qpid/cpp/examples/messaging/messaging_server.vcproj
similarity index 100%
rename from cpp/examples/messaging/messaging_server.vcproj
rename to qpid/cpp/examples/messaging/messaging_server.vcproj
diff --git a/cpp/examples/messaging/messaging_spout.vcproj b/qpid/cpp/examples/messaging/messaging_spout.vcproj
similarity index 100%
rename from cpp/examples/messaging/messaging_spout.vcproj
rename to qpid/cpp/examples/messaging/messaging_spout.vcproj
diff --git a/cpp/examples/messaging/readme.txt b/qpid/cpp/examples/messaging/readme.txt
similarity index 100%
rename from cpp/examples/messaging/readme.txt
rename to qpid/cpp/examples/messaging/readme.txt
diff --git a/cpp/examples/messaging/server.cpp b/qpid/cpp/examples/messaging/server.cpp
similarity index 100%
rename from cpp/examples/messaging/server.cpp
rename to qpid/cpp/examples/messaging/server.cpp
diff --git a/cpp/examples/messaging/spout.cpp b/qpid/cpp/examples/messaging/spout.cpp
similarity index 100%
rename from cpp/examples/messaging/spout.cpp
rename to qpid/cpp/examples/messaging/spout.cpp
diff --git a/cpp/examples/old_api/CMakeLists.txt b/qpid/cpp/examples/old_api/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/CMakeLists.txt
rename to qpid/cpp/examples/old_api/CMakeLists.txt
diff --git a/cpp/examples/old_api/Makefile.am b/qpid/cpp/examples/old_api/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/Makefile.am
rename to qpid/cpp/examples/old_api/Makefile.am
diff --git a/cpp/examples/old_api/README.verify b/qpid/cpp/examples/old_api/README.verify
similarity index 100%
rename from cpp/examples/old_api/README.verify
rename to qpid/cpp/examples/old_api/README.verify
diff --git a/cpp/examples/old_api/direct/CMakeLists.txt b/qpid/cpp/examples/old_api/direct/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/direct/CMakeLists.txt
rename to qpid/cpp/examples/old_api/direct/CMakeLists.txt
diff --git a/cpp/examples/old_api/direct/Makefile.am b/qpid/cpp/examples/old_api/direct/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/direct/Makefile.am
rename to qpid/cpp/examples/old_api/direct/Makefile.am
diff --git a/cpp/examples/old_api/direct/declare_queues.cpp b/qpid/cpp/examples/old_api/direct/declare_queues.cpp
similarity index 100%
rename from cpp/examples/old_api/direct/declare_queues.cpp
rename to qpid/cpp/examples/old_api/direct/declare_queues.cpp
diff --git a/cpp/examples/old_api/direct/direct_declare_queues.vcproj b/qpid/cpp/examples/old_api/direct/direct_declare_queues.vcproj
similarity index 100%
rename from cpp/examples/old_api/direct/direct_declare_queues.vcproj
rename to qpid/cpp/examples/old_api/direct/direct_declare_queues.vcproj
diff --git a/cpp/examples/old_api/direct/direct_direct_producer.vcproj b/qpid/cpp/examples/old_api/direct/direct_direct_producer.vcproj
similarity index 100%
rename from cpp/examples/old_api/direct/direct_direct_producer.vcproj
rename to qpid/cpp/examples/old_api/direct/direct_direct_producer.vcproj
diff --git a/cpp/examples/old_api/direct/direct_listener.vcproj b/qpid/cpp/examples/old_api/direct/direct_listener.vcproj
similarity index 100%
rename from cpp/examples/old_api/direct/direct_listener.vcproj
rename to qpid/cpp/examples/old_api/direct/direct_listener.vcproj
diff --git a/cpp/examples/old_api/direct/direct_producer.cpp b/qpid/cpp/examples/old_api/direct/direct_producer.cpp
similarity index 100%
rename from cpp/examples/old_api/direct/direct_producer.cpp
rename to qpid/cpp/examples/old_api/direct/direct_producer.cpp
diff --git a/cpp/examples/old_api/direct/listener.cpp b/qpid/cpp/examples/old_api/direct/listener.cpp
similarity index 100%
rename from cpp/examples/old_api/direct/listener.cpp
rename to qpid/cpp/examples/old_api/direct/listener.cpp
diff --git a/cpp/examples/old_api/direct/verify b/qpid/cpp/examples/old_api/direct/verify
similarity index 100%
rename from cpp/examples/old_api/direct/verify
rename to qpid/cpp/examples/old_api/direct/verify
diff --git a/cpp/examples/old_api/direct/verify.in b/qpid/cpp/examples/old_api/direct/verify.in
similarity index 100%
rename from cpp/examples/old_api/direct/verify.in
rename to qpid/cpp/examples/old_api/direct/verify.in
diff --git a/cpp/examples/old_api/failover/CMakeLists.txt b/qpid/cpp/examples/old_api/failover/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/failover/CMakeLists.txt
rename to qpid/cpp/examples/old_api/failover/CMakeLists.txt
diff --git a/cpp/examples/old_api/failover/Makefile.am b/qpid/cpp/examples/old_api/failover/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/failover/Makefile.am
rename to qpid/cpp/examples/old_api/failover/Makefile.am
diff --git a/cpp/examples/old_api/failover/declare_queues.cpp b/qpid/cpp/examples/old_api/failover/declare_queues.cpp
similarity index 100%
rename from cpp/examples/old_api/failover/declare_queues.cpp
rename to qpid/cpp/examples/old_api/failover/declare_queues.cpp
diff --git a/cpp/examples/old_api/failover/failover_declare_queues.vcproj b/qpid/cpp/examples/old_api/failover/failover_declare_queues.vcproj
similarity index 100%
rename from cpp/examples/old_api/failover/failover_declare_queues.vcproj
rename to qpid/cpp/examples/old_api/failover/failover_declare_queues.vcproj
diff --git a/cpp/examples/old_api/failover/failover_replaying_sender.vcproj b/qpid/cpp/examples/old_api/failover/failover_replaying_sender.vcproj
similarity index 100%
rename from cpp/examples/old_api/failover/failover_replaying_sender.vcproj
rename to qpid/cpp/examples/old_api/failover/failover_replaying_sender.vcproj
diff --git a/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj b/qpid/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
similarity index 100%
rename from cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
rename to qpid/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
diff --git a/cpp/examples/old_api/failover/replaying_sender.cpp b/qpid/cpp/examples/old_api/failover/replaying_sender.cpp
similarity index 100%
rename from cpp/examples/old_api/failover/replaying_sender.cpp
rename to qpid/cpp/examples/old_api/failover/replaying_sender.cpp
diff --git a/cpp/examples/old_api/failover/resuming_receiver.cpp b/qpid/cpp/examples/old_api/failover/resuming_receiver.cpp
similarity index 100%
rename from cpp/examples/old_api/failover/resuming_receiver.cpp
rename to qpid/cpp/examples/old_api/failover/resuming_receiver.cpp
diff --git a/cpp/examples/old_api/fanout/CMakeLists.txt b/qpid/cpp/examples/old_api/fanout/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/fanout/CMakeLists.txt
rename to qpid/cpp/examples/old_api/fanout/CMakeLists.txt
diff --git a/cpp/examples/old_api/fanout/Makefile.am b/qpid/cpp/examples/old_api/fanout/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/fanout/Makefile.am
rename to qpid/cpp/examples/old_api/fanout/Makefile.am
diff --git a/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj b/qpid/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
similarity index 100%
rename from cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
rename to qpid/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
diff --git a/cpp/examples/old_api/fanout/fanout_listener.vcproj b/qpid/cpp/examples/old_api/fanout/fanout_listener.vcproj
similarity index 100%
rename from cpp/examples/old_api/fanout/fanout_listener.vcproj
rename to qpid/cpp/examples/old_api/fanout/fanout_listener.vcproj
diff --git a/cpp/examples/old_api/fanout/fanout_producer.cpp b/qpid/cpp/examples/old_api/fanout/fanout_producer.cpp
similarity index 100%
rename from cpp/examples/old_api/fanout/fanout_producer.cpp
rename to qpid/cpp/examples/old_api/fanout/fanout_producer.cpp
diff --git a/cpp/examples/old_api/fanout/listener.cpp b/qpid/cpp/examples/old_api/fanout/listener.cpp
similarity index 100%
rename from cpp/examples/old_api/fanout/listener.cpp
rename to qpid/cpp/examples/old_api/fanout/listener.cpp
diff --git a/cpp/examples/old_api/fanout/verify b/qpid/cpp/examples/old_api/fanout/verify
similarity index 100%
rename from cpp/examples/old_api/fanout/verify
rename to qpid/cpp/examples/old_api/fanout/verify
diff --git a/cpp/examples/old_api/fanout/verify.in b/qpid/cpp/examples/old_api/fanout/verify.in
similarity index 100%
rename from cpp/examples/old_api/fanout/verify.in
rename to qpid/cpp/examples/old_api/fanout/verify.in
diff --git a/cpp/examples/old_api/old-examples.sln b/qpid/cpp/examples/old_api/old-examples.sln
similarity index 100%
rename from cpp/examples/old_api/old-examples.sln
rename to qpid/cpp/examples/old_api/old-examples.sln
diff --git a/cpp/examples/old_api/pub-sub/CMakeLists.txt b/qpid/cpp/examples/old_api/pub-sub/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/pub-sub/CMakeLists.txt
rename to qpid/cpp/examples/old_api/pub-sub/CMakeLists.txt
diff --git a/cpp/examples/old_api/pub-sub/Makefile.am b/qpid/cpp/examples/old_api/pub-sub/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/pub-sub/Makefile.am
rename to qpid/cpp/examples/old_api/pub-sub/Makefile.am
diff --git a/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj b/qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
similarity index 100%
rename from cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
rename to qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
diff --git a/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj b/qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
similarity index 100%
rename from cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
rename to qpid/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
diff --git a/cpp/examples/old_api/pub-sub/topic_listener.cpp b/qpid/cpp/examples/old_api/pub-sub/topic_listener.cpp
similarity index 100%
rename from cpp/examples/old_api/pub-sub/topic_listener.cpp
rename to qpid/cpp/examples/old_api/pub-sub/topic_listener.cpp
diff --git a/cpp/examples/old_api/pub-sub/topic_publisher.cpp b/qpid/cpp/examples/old_api/pub-sub/topic_publisher.cpp
similarity index 100%
rename from cpp/examples/old_api/pub-sub/topic_publisher.cpp
rename to qpid/cpp/examples/old_api/pub-sub/topic_publisher.cpp
diff --git a/cpp/examples/old_api/pub-sub/verify b/qpid/cpp/examples/old_api/pub-sub/verify
similarity index 100%
rename from cpp/examples/old_api/pub-sub/verify
rename to qpid/cpp/examples/old_api/pub-sub/verify
diff --git a/cpp/examples/old_api/pub-sub/verify.in b/qpid/cpp/examples/old_api/pub-sub/verify.in
similarity index 100%
rename from cpp/examples/old_api/pub-sub/verify.in
rename to qpid/cpp/examples/old_api/pub-sub/verify.in
diff --git a/cpp/examples/old_api/request-response/CMakeLists.txt b/qpid/cpp/examples/old_api/request-response/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/request-response/CMakeLists.txt
rename to qpid/cpp/examples/old_api/request-response/CMakeLists.txt
diff --git a/cpp/examples/old_api/request-response/Makefile.am b/qpid/cpp/examples/old_api/request-response/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/request-response/Makefile.am
rename to qpid/cpp/examples/old_api/request-response/Makefile.am
diff --git a/cpp/examples/old_api/request-response/client.cpp b/qpid/cpp/examples/old_api/request-response/client.cpp
similarity index 100%
rename from cpp/examples/old_api/request-response/client.cpp
rename to qpid/cpp/examples/old_api/request-response/client.cpp
diff --git a/cpp/examples/old_api/request-response/request-response_client.vcproj b/qpid/cpp/examples/old_api/request-response/request-response_client.vcproj
similarity index 100%
rename from cpp/examples/old_api/request-response/request-response_client.vcproj
rename to qpid/cpp/examples/old_api/request-response/request-response_client.vcproj
diff --git a/cpp/examples/old_api/request-response/request-response_server.vcproj b/qpid/cpp/examples/old_api/request-response/request-response_server.vcproj
similarity index 100%
rename from cpp/examples/old_api/request-response/request-response_server.vcproj
rename to qpid/cpp/examples/old_api/request-response/request-response_server.vcproj
diff --git a/cpp/examples/old_api/request-response/server.cpp b/qpid/cpp/examples/old_api/request-response/server.cpp
similarity index 100%
rename from cpp/examples/old_api/request-response/server.cpp
rename to qpid/cpp/examples/old_api/request-response/server.cpp
diff --git a/cpp/examples/old_api/request-response/verify b/qpid/cpp/examples/old_api/request-response/verify
similarity index 100%
rename from cpp/examples/old_api/request-response/verify
rename to qpid/cpp/examples/old_api/request-response/verify
diff --git a/cpp/examples/old_api/request-response/verify.in b/qpid/cpp/examples/old_api/request-response/verify.in
similarity index 100%
rename from cpp/examples/old_api/request-response/verify.in
rename to qpid/cpp/examples/old_api/request-response/verify.in
diff --git a/cpp/examples/old_api/tradedemo/CMakeLists.txt b/qpid/cpp/examples/old_api/tradedemo/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/tradedemo/CMakeLists.txt
rename to qpid/cpp/examples/old_api/tradedemo/CMakeLists.txt
diff --git a/cpp/examples/old_api/tradedemo/Makefile.am b/qpid/cpp/examples/old_api/tradedemo/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/tradedemo/Makefile.am
rename to qpid/cpp/examples/old_api/tradedemo/Makefile.am
diff --git a/cpp/examples/old_api/tradedemo/declare_queues.cpp b/qpid/cpp/examples/old_api/tradedemo/declare_queues.cpp
similarity index 100%
rename from cpp/examples/old_api/tradedemo/declare_queues.cpp
rename to qpid/cpp/examples/old_api/tradedemo/declare_queues.cpp
diff --git a/cpp/examples/old_api/tradedemo/topic_listener.cpp b/qpid/cpp/examples/old_api/tradedemo/topic_listener.cpp
similarity index 100%
rename from cpp/examples/old_api/tradedemo/topic_listener.cpp
rename to qpid/cpp/examples/old_api/tradedemo/topic_listener.cpp
diff --git a/cpp/examples/old_api/tradedemo/topic_publisher.cpp b/qpid/cpp/examples/old_api/tradedemo/topic_publisher.cpp
similarity index 100%
rename from cpp/examples/old_api/tradedemo/topic_publisher.cpp
rename to qpid/cpp/examples/old_api/tradedemo/topic_publisher.cpp
diff --git a/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj b/qpid/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
similarity index 100%
rename from cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
rename to qpid/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
diff --git a/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj b/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
similarity index 100%
rename from cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
rename to qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
diff --git a/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj b/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
similarity index 100%
rename from cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
rename to qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
diff --git a/cpp/examples/old_api/verify b/qpid/cpp/examples/old_api/verify
similarity index 100%
rename from cpp/examples/old_api/verify
rename to qpid/cpp/examples/old_api/verify
diff --git a/cpp/examples/old_api/verify_all b/qpid/cpp/examples/old_api/verify_all
similarity index 100%
rename from cpp/examples/old_api/verify_all
rename to qpid/cpp/examples/old_api/verify_all
diff --git a/cpp/examples/old_api/xml-exchange/CMakeLists.txt b/qpid/cpp/examples/old_api/xml-exchange/CMakeLists.txt
similarity index 100%
rename from cpp/examples/old_api/xml-exchange/CMakeLists.txt
rename to qpid/cpp/examples/old_api/xml-exchange/CMakeLists.txt
diff --git a/cpp/examples/old_api/xml-exchange/Makefile.am b/qpid/cpp/examples/old_api/xml-exchange/Makefile.am
similarity index 100%
rename from cpp/examples/old_api/xml-exchange/Makefile.am
rename to qpid/cpp/examples/old_api/xml-exchange/Makefile.am
diff --git a/cpp/examples/old_api/xml-exchange/README.txt b/qpid/cpp/examples/old_api/xml-exchange/README.txt
similarity index 100%
rename from cpp/examples/old_api/xml-exchange/README.txt
rename to qpid/cpp/examples/old_api/xml-exchange/README.txt
diff --git a/cpp/examples/old_api/xml-exchange/declare_queues.cpp b/qpid/cpp/examples/old_api/xml-exchange/declare_queues.cpp
similarity index 100%
rename from cpp/examples/old_api/xml-exchange/declare_queues.cpp
rename to qpid/cpp/examples/old_api/xml-exchange/declare_queues.cpp
diff --git a/cpp/examples/old_api/xml-exchange/listener.cpp b/qpid/cpp/examples/old_api/xml-exchange/listener.cpp
similarity index 100%
rename from cpp/examples/old_api/xml-exchange/listener.cpp
rename to qpid/cpp/examples/old_api/xml-exchange/listener.cpp
diff --git a/cpp/examples/old_api/xml-exchange/xml_producer.cpp b/qpid/cpp/examples/old_api/xml-exchange/xml_producer.cpp
similarity index 100%
rename from cpp/examples/old_api/xml-exchange/xml_producer.cpp
rename to qpid/cpp/examples/old_api/xml-exchange/xml_producer.cpp
diff --git a/cpp/examples/qmf-agent/Makefile b/qpid/cpp/examples/qmf-agent/Makefile
similarity index 100%
rename from cpp/examples/qmf-agent/Makefile
rename to qpid/cpp/examples/qmf-agent/Makefile
diff --git a/cpp/examples/qmf-agent/example.cpp b/qpid/cpp/examples/qmf-agent/example.cpp
similarity index 100%
rename from cpp/examples/qmf-agent/example.cpp
rename to qpid/cpp/examples/qmf-agent/example.cpp
diff --git a/cpp/examples/qmf-agent/example_gen.mak b/qpid/cpp/examples/qmf-agent/example_gen.mak
similarity index 100%
rename from cpp/examples/qmf-agent/example_gen.mak
rename to qpid/cpp/examples/qmf-agent/example_gen.mak
diff --git a/cpp/examples/qmf-agent/qmf_agent.vcproj b/qpid/cpp/examples/qmf-agent/qmf_agent.vcproj
similarity index 100%
rename from cpp/examples/qmf-agent/qmf_agent.vcproj
rename to qpid/cpp/examples/qmf-agent/qmf_agent.vcproj
diff --git a/cpp/examples/qmf-agent/schema.xml b/qpid/cpp/examples/qmf-agent/schema.xml
similarity index 100%
rename from cpp/examples/qmf-agent/schema.xml
rename to qpid/cpp/examples/qmf-agent/schema.xml
diff --git a/cpp/examples/qmf-console/CMakeLists.txt b/qpid/cpp/examples/qmf-console/CMakeLists.txt
similarity index 100%
rename from cpp/examples/qmf-console/CMakeLists.txt
rename to qpid/cpp/examples/qmf-console/CMakeLists.txt
diff --git a/cpp/examples/qmf-console/Makefile.am b/qpid/cpp/examples/qmf-console/Makefile.am
similarity index 100%
rename from cpp/examples/qmf-console/Makefile.am
rename to qpid/cpp/examples/qmf-console/Makefile.am
diff --git a/cpp/examples/qmf-console/README.txt b/qpid/cpp/examples/qmf-console/README.txt
similarity index 100%
rename from cpp/examples/qmf-console/README.txt
rename to qpid/cpp/examples/qmf-console/README.txt
diff --git a/cpp/examples/qmf-console/cluster-qmon.cpp b/qpid/cpp/examples/qmf-console/cluster-qmon.cpp
similarity index 100%
rename from cpp/examples/qmf-console/cluster-qmon.cpp
rename to qpid/cpp/examples/qmf-console/cluster-qmon.cpp
diff --git a/cpp/examples/qmf-console/console.cpp b/qpid/cpp/examples/qmf-console/console.cpp
similarity index 100%
rename from cpp/examples/qmf-console/console.cpp
rename to qpid/cpp/examples/qmf-console/console.cpp
diff --git a/cpp/examples/qmf-console/ping.cpp b/qpid/cpp/examples/qmf-console/ping.cpp
similarity index 100%
rename from cpp/examples/qmf-console/ping.cpp
rename to qpid/cpp/examples/qmf-console/ping.cpp
diff --git a/cpp/examples/qmf-console/printevents.cpp b/qpid/cpp/examples/qmf-console/printevents.cpp
similarity index 100%
rename from cpp/examples/qmf-console/printevents.cpp
rename to qpid/cpp/examples/qmf-console/printevents.cpp
diff --git a/cpp/examples/qmf-console/qmf-console_console.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_console.vcproj
similarity index 100%
rename from cpp/examples/qmf-console/qmf-console_console.vcproj
rename to qpid/cpp/examples/qmf-console/qmf-console_console.vcproj
diff --git a/cpp/examples/qmf-console/qmf-console_ping.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_ping.vcproj
similarity index 100%
rename from cpp/examples/qmf-console/qmf-console_ping.vcproj
rename to qpid/cpp/examples/qmf-console/qmf-console_ping.vcproj
diff --git a/cpp/examples/qmf-console/qmf-console_printevents.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_printevents.vcproj
similarity index 100%
rename from cpp/examples/qmf-console/qmf-console_printevents.vcproj
rename to qpid/cpp/examples/qmf-console/qmf-console_printevents.vcproj
diff --git a/cpp/examples/qmf-console/qmf-console_queuestats.vcproj b/qpid/cpp/examples/qmf-console/qmf-console_queuestats.vcproj
similarity index 100%
rename from cpp/examples/qmf-console/qmf-console_queuestats.vcproj
rename to qpid/cpp/examples/qmf-console/qmf-console_queuestats.vcproj
diff --git a/cpp/examples/qmf-console/queuestats.cpp b/qpid/cpp/examples/qmf-console/queuestats.cpp
similarity index 100%
rename from cpp/examples/qmf-console/queuestats.cpp
rename to qpid/cpp/examples/qmf-console/queuestats.cpp
diff --git a/cpp/examples/test.txt b/qpid/cpp/examples/test.txt
similarity index 100%
rename from cpp/examples/test.txt
rename to qpid/cpp/examples/test.txt
diff --git a/cpp/include/qmf/Agent.h b/qpid/cpp/include/qmf/Agent.h
similarity index 100%
rename from cpp/include/qmf/Agent.h
rename to qpid/cpp/include/qmf/Agent.h
diff --git a/cpp/include/qmf/AgentEvent.h b/qpid/cpp/include/qmf/AgentEvent.h
similarity index 100%
rename from cpp/include/qmf/AgentEvent.h
rename to qpid/cpp/include/qmf/AgentEvent.h
diff --git a/cpp/include/qmf/AgentSession.h b/qpid/cpp/include/qmf/AgentSession.h
similarity index 100%
rename from cpp/include/qmf/AgentSession.h
rename to qpid/cpp/include/qmf/AgentSession.h
diff --git a/cpp/include/qmf/ConsoleEvent.h b/qpid/cpp/include/qmf/ConsoleEvent.h
similarity index 100%
rename from cpp/include/qmf/ConsoleEvent.h
rename to qpid/cpp/include/qmf/ConsoleEvent.h
diff --git a/cpp/include/qmf/ConsoleSession.h b/qpid/cpp/include/qmf/ConsoleSession.h
similarity index 100%
rename from cpp/include/qmf/ConsoleSession.h
rename to qpid/cpp/include/qmf/ConsoleSession.h
diff --git a/cpp/include/qmf/Data.h b/qpid/cpp/include/qmf/Data.h
similarity index 100%
rename from cpp/include/qmf/Data.h
rename to qpid/cpp/include/qmf/Data.h
diff --git a/cpp/include/qmf/DataAddr.h b/qpid/cpp/include/qmf/DataAddr.h
similarity index 100%
rename from cpp/include/qmf/DataAddr.h
rename to qpid/cpp/include/qmf/DataAddr.h
diff --git a/cpp/include/qmf/Handle.h b/qpid/cpp/include/qmf/Handle.h
similarity index 100%
rename from cpp/include/qmf/Handle.h
rename to qpid/cpp/include/qmf/Handle.h
diff --git a/cpp/include/qmf/ImportExport.h b/qpid/cpp/include/qmf/ImportExport.h
similarity index 100%
rename from cpp/include/qmf/ImportExport.h
rename to qpid/cpp/include/qmf/ImportExport.h
diff --git a/cpp/include/qmf/Query.h b/qpid/cpp/include/qmf/Query.h
similarity index 100%
rename from cpp/include/qmf/Query.h
rename to qpid/cpp/include/qmf/Query.h
diff --git a/cpp/include/qmf/Schema.h b/qpid/cpp/include/qmf/Schema.h
similarity index 100%
rename from cpp/include/qmf/Schema.h
rename to qpid/cpp/include/qmf/Schema.h
diff --git a/cpp/include/qmf/SchemaId.h b/qpid/cpp/include/qmf/SchemaId.h
similarity index 100%
rename from cpp/include/qmf/SchemaId.h
rename to qpid/cpp/include/qmf/SchemaId.h
diff --git a/cpp/include/qmf/SchemaMethod.h b/qpid/cpp/include/qmf/SchemaMethod.h
similarity index 100%
rename from cpp/include/qmf/SchemaMethod.h
rename to qpid/cpp/include/qmf/SchemaMethod.h
diff --git a/cpp/include/qmf/SchemaProperty.h b/qpid/cpp/include/qmf/SchemaProperty.h
similarity index 100%
rename from cpp/include/qmf/SchemaProperty.h
rename to qpid/cpp/include/qmf/SchemaProperty.h
diff --git a/cpp/include/qmf/SchemaTypes.h b/qpid/cpp/include/qmf/SchemaTypes.h
similarity index 100%
rename from cpp/include/qmf/SchemaTypes.h
rename to qpid/cpp/include/qmf/SchemaTypes.h
diff --git a/cpp/include/qmf/Subscription.h b/qpid/cpp/include/qmf/Subscription.h
similarity index 100%
rename from cpp/include/qmf/Subscription.h
rename to qpid/cpp/include/qmf/Subscription.h
diff --git a/cpp/include/qmf/engine/Agent.h b/qpid/cpp/include/qmf/engine/Agent.h
similarity index 100%
rename from cpp/include/qmf/engine/Agent.h
rename to qpid/cpp/include/qmf/engine/Agent.h
diff --git a/cpp/include/qmf/engine/ConnectionSettings.h b/qpid/cpp/include/qmf/engine/ConnectionSettings.h
similarity index 100%
rename from cpp/include/qmf/engine/ConnectionSettings.h
rename to qpid/cpp/include/qmf/engine/ConnectionSettings.h
diff --git a/cpp/include/qmf/engine/Console.h b/qpid/cpp/include/qmf/engine/Console.h
similarity index 100%
rename from cpp/include/qmf/engine/Console.h
rename to qpid/cpp/include/qmf/engine/Console.h
diff --git a/cpp/include/qmf/engine/Event.h b/qpid/cpp/include/qmf/engine/Event.h
similarity index 100%
rename from cpp/include/qmf/engine/Event.h
rename to qpid/cpp/include/qmf/engine/Event.h
diff --git a/cpp/include/qmf/engine/Message.h b/qpid/cpp/include/qmf/engine/Message.h
similarity index 100%
rename from cpp/include/qmf/engine/Message.h
rename to qpid/cpp/include/qmf/engine/Message.h
diff --git a/cpp/include/qmf/engine/Object.h b/qpid/cpp/include/qmf/engine/Object.h
similarity index 100%
rename from cpp/include/qmf/engine/Object.h
rename to qpid/cpp/include/qmf/engine/Object.h
diff --git a/cpp/include/qmf/engine/ObjectId.h b/qpid/cpp/include/qmf/engine/ObjectId.h
similarity index 100%
rename from cpp/include/qmf/engine/ObjectId.h
rename to qpid/cpp/include/qmf/engine/ObjectId.h
diff --git a/cpp/include/qmf/engine/QmfEngineImportExport.h b/qpid/cpp/include/qmf/engine/QmfEngineImportExport.h
similarity index 100%
rename from cpp/include/qmf/engine/QmfEngineImportExport.h
rename to qpid/cpp/include/qmf/engine/QmfEngineImportExport.h
diff --git a/cpp/include/qmf/engine/Query.h b/qpid/cpp/include/qmf/engine/Query.h
similarity index 100%
rename from cpp/include/qmf/engine/Query.h
rename to qpid/cpp/include/qmf/engine/Query.h
diff --git a/cpp/include/qmf/engine/ResilientConnection.h b/qpid/cpp/include/qmf/engine/ResilientConnection.h
similarity index 100%
rename from cpp/include/qmf/engine/ResilientConnection.h
rename to qpid/cpp/include/qmf/engine/ResilientConnection.h
diff --git a/cpp/include/qmf/engine/Schema.h b/qpid/cpp/include/qmf/engine/Schema.h
similarity index 100%
rename from cpp/include/qmf/engine/Schema.h
rename to qpid/cpp/include/qmf/engine/Schema.h
diff --git a/cpp/include/qmf/engine/Typecode.h b/qpid/cpp/include/qmf/engine/Typecode.h
similarity index 100%
rename from cpp/include/qmf/engine/Typecode.h
rename to qpid/cpp/include/qmf/engine/Typecode.h
diff --git a/cpp/include/qmf/engine/Value.h b/qpid/cpp/include/qmf/engine/Value.h
similarity index 100%
rename from cpp/include/qmf/engine/Value.h
rename to qpid/cpp/include/qmf/engine/Value.h
diff --git a/cpp/include/qmf/exceptions.h b/qpid/cpp/include/qmf/exceptions.h
similarity index 100%
rename from cpp/include/qmf/exceptions.h
rename to qpid/cpp/include/qmf/exceptions.h
diff --git a/cpp/include/qpid/Address.h b/qpid/cpp/include/qpid/Address.h
similarity index 100%
rename from cpp/include/qpid/Address.h
rename to qpid/cpp/include/qpid/Address.h
diff --git a/cpp/include/qpid/CommonImportExport.h b/qpid/cpp/include/qpid/CommonImportExport.h
similarity index 100%
rename from cpp/include/qpid/CommonImportExport.h
rename to qpid/cpp/include/qpid/CommonImportExport.h
diff --git a/cpp/include/qpid/Exception.h b/qpid/cpp/include/qpid/Exception.h
similarity index 100%
rename from cpp/include/qpid/Exception.h
rename to qpid/cpp/include/qpid/Exception.h
diff --git a/cpp/include/qpid/ImportExport.h b/qpid/cpp/include/qpid/ImportExport.h
similarity index 100%
rename from cpp/include/qpid/ImportExport.h
rename to qpid/cpp/include/qpid/ImportExport.h
diff --git a/cpp/include/qpid/InlineAllocator.h b/qpid/cpp/include/qpid/InlineAllocator.h
similarity index 100%
rename from cpp/include/qpid/InlineAllocator.h
rename to qpid/cpp/include/qpid/InlineAllocator.h
diff --git a/cpp/include/qpid/InlineVector.h b/qpid/cpp/include/qpid/InlineVector.h
similarity index 100%
rename from cpp/include/qpid/InlineVector.h
rename to qpid/cpp/include/qpid/InlineVector.h
diff --git a/cpp/include/qpid/Msg.h b/qpid/cpp/include/qpid/Msg.h
similarity index 100%
rename from cpp/include/qpid/Msg.h
rename to qpid/cpp/include/qpid/Msg.h
diff --git a/cpp/include/qpid/Options.h b/qpid/cpp/include/qpid/Options.h
similarity index 100%
rename from cpp/include/qpid/Options.h
rename to qpid/cpp/include/qpid/Options.h
diff --git a/cpp/include/qpid/RangeSet.h b/qpid/cpp/include/qpid/RangeSet.h
similarity index 100%
rename from cpp/include/qpid/RangeSet.h
rename to qpid/cpp/include/qpid/RangeSet.h
diff --git a/cpp/include/qpid/SessionId.h b/qpid/cpp/include/qpid/SessionId.h
similarity index 100%
rename from cpp/include/qpid/SessionId.h
rename to qpid/cpp/include/qpid/SessionId.h
diff --git a/cpp/include/qpid/Url.h b/qpid/cpp/include/qpid/Url.h
similarity index 100%
rename from cpp/include/qpid/Url.h
rename to qpid/cpp/include/qpid/Url.h
diff --git a/cpp/include/qpid/agent/ManagementAgent.h b/qpid/cpp/include/qpid/agent/ManagementAgent.h
similarity index 100%
rename from cpp/include/qpid/agent/ManagementAgent.h
rename to qpid/cpp/include/qpid/agent/ManagementAgent.h
diff --git a/cpp/include/qpid/agent/QmfAgentImportExport.h b/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
similarity index 100%
rename from cpp/include/qpid/agent/QmfAgentImportExport.h
rename to qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
diff --git a/cpp/include/qpid/amqp_0_10/Codecs.h b/qpid/cpp/include/qpid/amqp_0_10/Codecs.h
similarity index 100%
rename from cpp/include/qpid/amqp_0_10/Codecs.h
rename to qpid/cpp/include/qpid/amqp_0_10/Codecs.h
diff --git a/cpp/include/qpid/client/AsyncSession.h b/qpid/cpp/include/qpid/client/AsyncSession.h
similarity index 100%
rename from cpp/include/qpid/client/AsyncSession.h
rename to qpid/cpp/include/qpid/client/AsyncSession.h
diff --git a/cpp/include/qpid/client/ClientImportExport.h b/qpid/cpp/include/qpid/client/ClientImportExport.h
similarity index 100%
rename from cpp/include/qpid/client/ClientImportExport.h
rename to qpid/cpp/include/qpid/client/ClientImportExport.h
diff --git a/cpp/include/qpid/client/Completion.h b/qpid/cpp/include/qpid/client/Completion.h
similarity index 100%
rename from cpp/include/qpid/client/Completion.h
rename to qpid/cpp/include/qpid/client/Completion.h
diff --git a/cpp/include/qpid/client/Connection.h b/qpid/cpp/include/qpid/client/Connection.h
similarity index 100%
rename from cpp/include/qpid/client/Connection.h
rename to qpid/cpp/include/qpid/client/Connection.h
diff --git a/cpp/include/qpid/client/ConnectionSettings.h b/qpid/cpp/include/qpid/client/ConnectionSettings.h
similarity index 100%
rename from cpp/include/qpid/client/ConnectionSettings.h
rename to qpid/cpp/include/qpid/client/ConnectionSettings.h
diff --git a/cpp/include/qpid/client/FailoverListener.h b/qpid/cpp/include/qpid/client/FailoverListener.h
similarity index 100%
rename from cpp/include/qpid/client/FailoverListener.h
rename to qpid/cpp/include/qpid/client/FailoverListener.h
diff --git a/cpp/include/qpid/client/FailoverManager.h b/qpid/cpp/include/qpid/client/FailoverManager.h
similarity index 100%
rename from cpp/include/qpid/client/FailoverManager.h
rename to qpid/cpp/include/qpid/client/FailoverManager.h
diff --git a/cpp/include/qpid/client/FlowControl.h b/qpid/cpp/include/qpid/client/FlowControl.h
similarity index 100%
rename from cpp/include/qpid/client/FlowControl.h
rename to qpid/cpp/include/qpid/client/FlowControl.h
diff --git a/cpp/include/qpid/client/Future.h b/qpid/cpp/include/qpid/client/Future.h
similarity index 100%
rename from cpp/include/qpid/client/Future.h
rename to qpid/cpp/include/qpid/client/Future.h
diff --git a/cpp/include/qpid/client/FutureCompletion.h b/qpid/cpp/include/qpid/client/FutureCompletion.h
similarity index 100%
rename from cpp/include/qpid/client/FutureCompletion.h
rename to qpid/cpp/include/qpid/client/FutureCompletion.h
diff --git a/cpp/include/qpid/client/FutureResult.h b/qpid/cpp/include/qpid/client/FutureResult.h
similarity index 100%
rename from cpp/include/qpid/client/FutureResult.h
rename to qpid/cpp/include/qpid/client/FutureResult.h
diff --git a/cpp/include/qpid/client/Handle.h b/qpid/cpp/include/qpid/client/Handle.h
similarity index 100%
rename from cpp/include/qpid/client/Handle.h
rename to qpid/cpp/include/qpid/client/Handle.h
diff --git a/cpp/include/qpid/client/LocalQueue.h b/qpid/cpp/include/qpid/client/LocalQueue.h
similarity index 100%
rename from cpp/include/qpid/client/LocalQueue.h
rename to qpid/cpp/include/qpid/client/LocalQueue.h
diff --git a/cpp/include/qpid/client/Message.h b/qpid/cpp/include/qpid/client/Message.h
similarity index 100%
rename from cpp/include/qpid/client/Message.h
rename to qpid/cpp/include/qpid/client/Message.h
diff --git a/cpp/include/qpid/client/MessageListener.h b/qpid/cpp/include/qpid/client/MessageListener.h
similarity index 100%
rename from cpp/include/qpid/client/MessageListener.h
rename to qpid/cpp/include/qpid/client/MessageListener.h
diff --git a/cpp/include/qpid/client/MessageReplayTracker.h b/qpid/cpp/include/qpid/client/MessageReplayTracker.h
similarity index 100%
rename from cpp/include/qpid/client/MessageReplayTracker.h
rename to qpid/cpp/include/qpid/client/MessageReplayTracker.h
diff --git a/cpp/include/qpid/client/QueueOptions.h b/qpid/cpp/include/qpid/client/QueueOptions.h
similarity index 100%
rename from cpp/include/qpid/client/QueueOptions.h
rename to qpid/cpp/include/qpid/client/QueueOptions.h
diff --git a/cpp/include/qpid/client/Session.h b/qpid/cpp/include/qpid/client/Session.h
similarity index 100%
rename from cpp/include/qpid/client/Session.h
rename to qpid/cpp/include/qpid/client/Session.h
diff --git a/cpp/include/qpid/client/SessionBase_0_10.h b/qpid/cpp/include/qpid/client/SessionBase_0_10.h
similarity index 100%
rename from cpp/include/qpid/client/SessionBase_0_10.h
rename to qpid/cpp/include/qpid/client/SessionBase_0_10.h
diff --git a/cpp/include/qpid/client/Subscription.h b/qpid/cpp/include/qpid/client/Subscription.h
similarity index 100%
rename from cpp/include/qpid/client/Subscription.h
rename to qpid/cpp/include/qpid/client/Subscription.h
diff --git a/cpp/include/qpid/client/SubscriptionManager.h b/qpid/cpp/include/qpid/client/SubscriptionManager.h
similarity index 100%
rename from cpp/include/qpid/client/SubscriptionManager.h
rename to qpid/cpp/include/qpid/client/SubscriptionManager.h
diff --git a/cpp/include/qpid/client/SubscriptionSettings.h b/qpid/cpp/include/qpid/client/SubscriptionSettings.h
similarity index 100%
rename from cpp/include/qpid/client/SubscriptionSettings.h
rename to qpid/cpp/include/qpid/client/SubscriptionSettings.h
diff --git a/cpp/include/qpid/client/TypedResult.h b/qpid/cpp/include/qpid/client/TypedResult.h
similarity index 100%
rename from cpp/include/qpid/client/TypedResult.h
rename to qpid/cpp/include/qpid/client/TypedResult.h
diff --git a/cpp/include/qpid/console/Agent.h b/qpid/cpp/include/qpid/console/Agent.h
similarity index 100%
rename from cpp/include/qpid/console/Agent.h
rename to qpid/cpp/include/qpid/console/Agent.h
diff --git a/cpp/include/qpid/console/Broker.h b/qpid/cpp/include/qpid/console/Broker.h
similarity index 100%
rename from cpp/include/qpid/console/Broker.h
rename to qpid/cpp/include/qpid/console/Broker.h
diff --git a/cpp/include/qpid/console/ClassKey.h b/qpid/cpp/include/qpid/console/ClassKey.h
similarity index 100%
rename from cpp/include/qpid/console/ClassKey.h
rename to qpid/cpp/include/qpid/console/ClassKey.h
diff --git a/cpp/include/qpid/console/ConsoleImportExport.h b/qpid/cpp/include/qpid/console/ConsoleImportExport.h
similarity index 100%
rename from cpp/include/qpid/console/ConsoleImportExport.h
rename to qpid/cpp/include/qpid/console/ConsoleImportExport.h
diff --git a/cpp/include/qpid/console/ConsoleListener.h b/qpid/cpp/include/qpid/console/ConsoleListener.h
similarity index 100%
rename from cpp/include/qpid/console/ConsoleListener.h
rename to qpid/cpp/include/qpid/console/ConsoleListener.h
diff --git a/cpp/include/qpid/console/Event.h b/qpid/cpp/include/qpid/console/Event.h
similarity index 100%
rename from cpp/include/qpid/console/Event.h
rename to qpid/cpp/include/qpid/console/Event.h
diff --git a/cpp/include/qpid/console/Object.h b/qpid/cpp/include/qpid/console/Object.h
similarity index 100%
rename from cpp/include/qpid/console/Object.h
rename to qpid/cpp/include/qpid/console/Object.h
diff --git a/cpp/include/qpid/console/ObjectId.h b/qpid/cpp/include/qpid/console/ObjectId.h
similarity index 100%
rename from cpp/include/qpid/console/ObjectId.h
rename to qpid/cpp/include/qpid/console/ObjectId.h
diff --git a/cpp/include/qpid/console/Package.h b/qpid/cpp/include/qpid/console/Package.h
similarity index 100%
rename from cpp/include/qpid/console/Package.h
rename to qpid/cpp/include/qpid/console/Package.h
diff --git a/cpp/include/qpid/console/Schema.h b/qpid/cpp/include/qpid/console/Schema.h
similarity index 100%
rename from cpp/include/qpid/console/Schema.h
rename to qpid/cpp/include/qpid/console/Schema.h
diff --git a/cpp/include/qpid/console/SequenceManager.h b/qpid/cpp/include/qpid/console/SequenceManager.h
similarity index 100%
rename from cpp/include/qpid/console/SequenceManager.h
rename to qpid/cpp/include/qpid/console/SequenceManager.h
diff --git a/cpp/include/qpid/console/SessionManager.h b/qpid/cpp/include/qpid/console/SessionManager.h
similarity index 100%
rename from cpp/include/qpid/console/SessionManager.h
rename to qpid/cpp/include/qpid/console/SessionManager.h
diff --git a/cpp/include/qpid/console/Value.h b/qpid/cpp/include/qpid/console/Value.h
similarity index 100%
rename from cpp/include/qpid/console/Value.h
rename to qpid/cpp/include/qpid/console/Value.h
diff --git a/cpp/include/qpid/framing/Array.h b/qpid/cpp/include/qpid/framing/Array.h
similarity index 100%
rename from cpp/include/qpid/framing/Array.h
rename to qpid/cpp/include/qpid/framing/Array.h
diff --git a/cpp/include/qpid/framing/Buffer.h b/qpid/cpp/include/qpid/framing/Buffer.h
similarity index 100%
rename from cpp/include/qpid/framing/Buffer.h
rename to qpid/cpp/include/qpid/framing/Buffer.h
diff --git a/cpp/include/qpid/framing/FieldTable.h b/qpid/cpp/include/qpid/framing/FieldTable.h
similarity index 100%
rename from cpp/include/qpid/framing/FieldTable.h
rename to qpid/cpp/include/qpid/framing/FieldTable.h
diff --git a/cpp/include/qpid/framing/FieldValue.h b/qpid/cpp/include/qpid/framing/FieldValue.h
similarity index 100%
rename from cpp/include/qpid/framing/FieldValue.h
rename to qpid/cpp/include/qpid/framing/FieldValue.h
diff --git a/cpp/include/qpid/framing/List.h b/qpid/cpp/include/qpid/framing/List.h
similarity index 100%
rename from cpp/include/qpid/framing/List.h
rename to qpid/cpp/include/qpid/framing/List.h
diff --git a/cpp/include/qpid/framing/ProtocolVersion.h b/qpid/cpp/include/qpid/framing/ProtocolVersion.h
similarity index 100%
rename from cpp/include/qpid/framing/ProtocolVersion.h
rename to qpid/cpp/include/qpid/framing/ProtocolVersion.h
diff --git a/cpp/include/qpid/framing/SequenceNumber.h b/qpid/cpp/include/qpid/framing/SequenceNumber.h
similarity index 100%
rename from cpp/include/qpid/framing/SequenceNumber.h
rename to qpid/cpp/include/qpid/framing/SequenceNumber.h
diff --git a/cpp/include/qpid/framing/SequenceSet.h b/qpid/cpp/include/qpid/framing/SequenceSet.h
similarity index 100%
rename from cpp/include/qpid/framing/SequenceSet.h
rename to qpid/cpp/include/qpid/framing/SequenceSet.h
diff --git a/cpp/include/qpid/framing/StructHelper.h b/qpid/cpp/include/qpid/framing/StructHelper.h
similarity index 100%
rename from cpp/include/qpid/framing/StructHelper.h
rename to qpid/cpp/include/qpid/framing/StructHelper.h
diff --git a/cpp/include/qpid/framing/Uuid.h b/qpid/cpp/include/qpid/framing/Uuid.h
similarity index 100%
rename from cpp/include/qpid/framing/Uuid.h
rename to qpid/cpp/include/qpid/framing/Uuid.h
diff --git a/cpp/include/qpid/framing/amqp_types.h b/qpid/cpp/include/qpid/framing/amqp_types.h
similarity index 100%
rename from cpp/include/qpid/framing/amqp_types.h
rename to qpid/cpp/include/qpid/framing/amqp_types.h
diff --git a/cpp/include/qpid/framing/amqp_types_full.h b/qpid/cpp/include/qpid/framing/amqp_types_full.h
similarity index 100%
rename from cpp/include/qpid/framing/amqp_types_full.h
rename to qpid/cpp/include/qpid/framing/amqp_types_full.h
diff --git a/cpp/include/qpid/log/Logger.h b/qpid/cpp/include/qpid/log/Logger.h
similarity index 100%
rename from cpp/include/qpid/log/Logger.h
rename to qpid/cpp/include/qpid/log/Logger.h
diff --git a/cpp/include/qpid/log/Options.h b/qpid/cpp/include/qpid/log/Options.h
similarity index 100%
rename from cpp/include/qpid/log/Options.h
rename to qpid/cpp/include/qpid/log/Options.h
diff --git a/cpp/include/qpid/log/Selector.h b/qpid/cpp/include/qpid/log/Selector.h
similarity index 100%
rename from cpp/include/qpid/log/Selector.h
rename to qpid/cpp/include/qpid/log/Selector.h
diff --git a/cpp/include/qpid/log/SinkOptions.h b/qpid/cpp/include/qpid/log/SinkOptions.h
similarity index 100%
rename from cpp/include/qpid/log/SinkOptions.h
rename to qpid/cpp/include/qpid/log/SinkOptions.h
diff --git a/cpp/include/qpid/log/Statement.h b/qpid/cpp/include/qpid/log/Statement.h
similarity index 100%
rename from cpp/include/qpid/log/Statement.h
rename to qpid/cpp/include/qpid/log/Statement.h
diff --git a/cpp/include/qpid/management/Args.h b/qpid/cpp/include/qpid/management/Args.h
similarity index 100%
rename from cpp/include/qpid/management/Args.h
rename to qpid/cpp/include/qpid/management/Args.h
diff --git a/cpp/include/qpid/management/Buffer.h b/qpid/cpp/include/qpid/management/Buffer.h
similarity index 100%
rename from cpp/include/qpid/management/Buffer.h
rename to qpid/cpp/include/qpid/management/Buffer.h
diff --git a/cpp/include/qpid/management/ConnectionSettings.h b/qpid/cpp/include/qpid/management/ConnectionSettings.h
similarity index 100%
rename from cpp/include/qpid/management/ConnectionSettings.h
rename to qpid/cpp/include/qpid/management/ConnectionSettings.h
diff --git a/cpp/include/qpid/management/Manageable.h b/qpid/cpp/include/qpid/management/Manageable.h
similarity index 100%
rename from cpp/include/qpid/management/Manageable.h
rename to qpid/cpp/include/qpid/management/Manageable.h
diff --git a/cpp/include/qpid/management/ManagementEvent.h b/qpid/cpp/include/qpid/management/ManagementEvent.h
similarity index 100%
rename from cpp/include/qpid/management/ManagementEvent.h
rename to qpid/cpp/include/qpid/management/ManagementEvent.h
diff --git a/cpp/include/qpid/management/ManagementObject.h b/qpid/cpp/include/qpid/management/ManagementObject.h
similarity index 100%
rename from cpp/include/qpid/management/ManagementObject.h
rename to qpid/cpp/include/qpid/management/ManagementObject.h
diff --git a/cpp/include/qpid/management/Mutex.h b/qpid/cpp/include/qpid/management/Mutex.h
similarity index 100%
rename from cpp/include/qpid/management/Mutex.h
rename to qpid/cpp/include/qpid/management/Mutex.h
diff --git a/cpp/include/qpid/messaging/Address.h b/qpid/cpp/include/qpid/messaging/Address.h
similarity index 100%
rename from cpp/include/qpid/messaging/Address.h
rename to qpid/cpp/include/qpid/messaging/Address.h
diff --git a/cpp/include/qpid/messaging/Connection.h b/qpid/cpp/include/qpid/messaging/Connection.h
similarity index 100%
rename from cpp/include/qpid/messaging/Connection.h
rename to qpid/cpp/include/qpid/messaging/Connection.h
diff --git a/cpp/include/qpid/messaging/Duration.h b/qpid/cpp/include/qpid/messaging/Duration.h
similarity index 100%
rename from cpp/include/qpid/messaging/Duration.h
rename to qpid/cpp/include/qpid/messaging/Duration.h
diff --git a/cpp/include/qpid/messaging/FailoverUpdates.h b/qpid/cpp/include/qpid/messaging/FailoverUpdates.h
similarity index 100%
rename from cpp/include/qpid/messaging/FailoverUpdates.h
rename to qpid/cpp/include/qpid/messaging/FailoverUpdates.h
diff --git a/cpp/include/qpid/messaging/Handle.h b/qpid/cpp/include/qpid/messaging/Handle.h
similarity index 100%
rename from cpp/include/qpid/messaging/Handle.h
rename to qpid/cpp/include/qpid/messaging/Handle.h
diff --git a/cpp/include/qpid/messaging/ImportExport.h b/qpid/cpp/include/qpid/messaging/ImportExport.h
similarity index 100%
rename from cpp/include/qpid/messaging/ImportExport.h
rename to qpid/cpp/include/qpid/messaging/ImportExport.h
diff --git a/cpp/include/qpid/messaging/Message.h b/qpid/cpp/include/qpid/messaging/Message.h
similarity index 100%
rename from cpp/include/qpid/messaging/Message.h
rename to qpid/cpp/include/qpid/messaging/Message.h
diff --git a/cpp/include/qpid/messaging/Receiver.h b/qpid/cpp/include/qpid/messaging/Receiver.h
similarity index 100%
rename from cpp/include/qpid/messaging/Receiver.h
rename to qpid/cpp/include/qpid/messaging/Receiver.h
diff --git a/cpp/include/qpid/messaging/Sender.h b/qpid/cpp/include/qpid/messaging/Sender.h
similarity index 100%
rename from cpp/include/qpid/messaging/Sender.h
rename to qpid/cpp/include/qpid/messaging/Sender.h
diff --git a/cpp/include/qpid/messaging/Session.h b/qpid/cpp/include/qpid/messaging/Session.h
similarity index 100%
rename from cpp/include/qpid/messaging/Session.h
rename to qpid/cpp/include/qpid/messaging/Session.h
diff --git a/cpp/include/qpid/messaging/exceptions.h b/qpid/cpp/include/qpid/messaging/exceptions.h
similarity index 100%
rename from cpp/include/qpid/messaging/exceptions.h
rename to qpid/cpp/include/qpid/messaging/exceptions.h
diff --git a/cpp/include/qpid/sys/Condition.h b/qpid/cpp/include/qpid/sys/Condition.h
similarity index 100%
rename from cpp/include/qpid/sys/Condition.h
rename to qpid/cpp/include/qpid/sys/Condition.h
diff --git a/cpp/include/qpid/sys/ExceptionHolder.h b/qpid/cpp/include/qpid/sys/ExceptionHolder.h
similarity index 100%
rename from cpp/include/qpid/sys/ExceptionHolder.h
rename to qpid/cpp/include/qpid/sys/ExceptionHolder.h
diff --git a/cpp/include/qpid/sys/IOHandle.h b/qpid/cpp/include/qpid/sys/IOHandle.h
similarity index 100%
rename from cpp/include/qpid/sys/IOHandle.h
rename to qpid/cpp/include/qpid/sys/IOHandle.h
diff --git a/cpp/include/qpid/sys/IntegerTypes.h b/qpid/cpp/include/qpid/sys/IntegerTypes.h
similarity index 100%
rename from cpp/include/qpid/sys/IntegerTypes.h
rename to qpid/cpp/include/qpid/sys/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/Monitor.h b/qpid/cpp/include/qpid/sys/Monitor.h
similarity index 100%
rename from cpp/include/qpid/sys/Monitor.h
rename to qpid/cpp/include/qpid/sys/Monitor.h
diff --git a/cpp/include/qpid/sys/Mutex.h b/qpid/cpp/include/qpid/sys/Mutex.h
similarity index 100%
rename from cpp/include/qpid/sys/Mutex.h
rename to qpid/cpp/include/qpid/sys/Mutex.h
diff --git a/cpp/include/qpid/sys/Runnable.h b/qpid/cpp/include/qpid/sys/Runnable.h
similarity index 100%
rename from cpp/include/qpid/sys/Runnable.h
rename to qpid/cpp/include/qpid/sys/Runnable.h
diff --git a/cpp/include/qpid/sys/StrError.h b/qpid/cpp/include/qpid/sys/StrError.h
similarity index 100%
rename from cpp/include/qpid/sys/StrError.h
rename to qpid/cpp/include/qpid/sys/StrError.h
diff --git a/cpp/include/qpid/sys/SystemInfo.h b/qpid/cpp/include/qpid/sys/SystemInfo.h
similarity index 100%
rename from cpp/include/qpid/sys/SystemInfo.h
rename to qpid/cpp/include/qpid/sys/SystemInfo.h
diff --git a/cpp/include/qpid/sys/Thread.h b/qpid/cpp/include/qpid/sys/Thread.h
similarity index 100%
rename from cpp/include/qpid/sys/Thread.h
rename to qpid/cpp/include/qpid/sys/Thread.h
diff --git a/cpp/include/qpid/sys/Time.h b/qpid/cpp/include/qpid/sys/Time.h
similarity index 100%
rename from cpp/include/qpid/sys/Time.h
rename to qpid/cpp/include/qpid/sys/Time.h
diff --git a/cpp/include/qpid/sys/posix/Condition.h b/qpid/cpp/include/qpid/sys/posix/Condition.h
similarity index 100%
rename from cpp/include/qpid/sys/posix/Condition.h
rename to qpid/cpp/include/qpid/sys/posix/Condition.h
diff --git a/cpp/include/qpid/sys/posix/IntegerTypes.h b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
similarity index 100%
rename from cpp/include/qpid/sys/posix/IntegerTypes.h
rename to qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/posix/Mutex.h b/qpid/cpp/include/qpid/sys/posix/Mutex.h
similarity index 100%
rename from cpp/include/qpid/sys/posix/Mutex.h
rename to qpid/cpp/include/qpid/sys/posix/Mutex.h
diff --git a/cpp/include/qpid/sys/posix/PrivatePosix.h b/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
similarity index 100%
rename from cpp/include/qpid/sys/posix/PrivatePosix.h
rename to qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
diff --git a/cpp/include/qpid/sys/posix/Time.h b/qpid/cpp/include/qpid/sys/posix/Time.h
similarity index 100%
rename from cpp/include/qpid/sys/posix/Time.h
rename to qpid/cpp/include/qpid/sys/posix/Time.h
diff --git a/cpp/include/qpid/sys/posix/check.h b/qpid/cpp/include/qpid/sys/posix/check.h
similarity index 100%
rename from cpp/include/qpid/sys/posix/check.h
rename to qpid/cpp/include/qpid/sys/posix/check.h
diff --git a/cpp/include/qpid/sys/windows/Condition.h b/qpid/cpp/include/qpid/sys/windows/Condition.h
similarity index 100%
rename from cpp/include/qpid/sys/windows/Condition.h
rename to qpid/cpp/include/qpid/sys/windows/Condition.h
diff --git a/cpp/include/qpid/sys/windows/IntegerTypes.h b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
similarity index 100%
rename from cpp/include/qpid/sys/windows/IntegerTypes.h
rename to qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/windows/Mutex.h b/qpid/cpp/include/qpid/sys/windows/Mutex.h
similarity index 100%
rename from cpp/include/qpid/sys/windows/Mutex.h
rename to qpid/cpp/include/qpid/sys/windows/Mutex.h
diff --git a/cpp/include/qpid/sys/windows/Time.h b/qpid/cpp/include/qpid/sys/windows/Time.h
similarity index 100%
rename from cpp/include/qpid/sys/windows/Time.h
rename to qpid/cpp/include/qpid/sys/windows/Time.h
diff --git a/cpp/include/qpid/sys/windows/check.h b/qpid/cpp/include/qpid/sys/windows/check.h
similarity index 100%
rename from cpp/include/qpid/sys/windows/check.h
rename to qpid/cpp/include/qpid/sys/windows/check.h
diff --git a/cpp/include/qpid/types/Exception.h b/qpid/cpp/include/qpid/types/Exception.h
similarity index 100%
rename from cpp/include/qpid/types/Exception.h
rename to qpid/cpp/include/qpid/types/Exception.h
diff --git a/cpp/include/qpid/types/ImportExport.h b/qpid/cpp/include/qpid/types/ImportExport.h
similarity index 100%
rename from cpp/include/qpid/types/ImportExport.h
rename to qpid/cpp/include/qpid/types/ImportExport.h
diff --git a/cpp/include/qpid/types/Uuid.h b/qpid/cpp/include/qpid/types/Uuid.h
similarity index 100%
rename from cpp/include/qpid/types/Uuid.h
rename to qpid/cpp/include/qpid/types/Uuid.h
diff --git a/cpp/include/qpid/types/Variant.h b/qpid/cpp/include/qpid/types/Variant.h
similarity index 100%
rename from cpp/include/qpid/types/Variant.h
rename to qpid/cpp/include/qpid/types/Variant.h
diff --git a/cpp/m4/ac_pkg_swig.m4 b/qpid/cpp/m4/ac_pkg_swig.m4
similarity index 100%
rename from cpp/m4/ac_pkg_swig.m4
rename to qpid/cpp/m4/ac_pkg_swig.m4
diff --git a/cpp/m4/clock_time.m4 b/qpid/cpp/m4/clock_time.m4
similarity index 100%
rename from cpp/m4/clock_time.m4
rename to qpid/cpp/m4/clock_time.m4
diff --git a/cpp/m4/compiler-flags.m4 b/qpid/cpp/m4/compiler-flags.m4
similarity index 100%
rename from cpp/m4/compiler-flags.m4
rename to qpid/cpp/m4/compiler-flags.m4
diff --git a/cpp/m4/cppunit.m4 b/qpid/cpp/m4/cppunit.m4
similarity index 100%
rename from cpp/m4/cppunit.m4
rename to qpid/cpp/m4/cppunit.m4
diff --git a/cpp/m4/extensions.m4 b/qpid/cpp/m4/extensions.m4
similarity index 100%
rename from cpp/m4/extensions.m4
rename to qpid/cpp/m4/extensions.m4
diff --git a/cpp/m4/python.m4 b/qpid/cpp/m4/python.m4
similarity index 100%
rename from cpp/m4/python.m4
rename to qpid/cpp/m4/python.m4
diff --git a/cpp/make-dist b/qpid/cpp/make-dist
similarity index 100%
rename from cpp/make-dist
rename to qpid/cpp/make-dist
diff --git a/cpp/managementgen/CMakeLists.txt b/qpid/cpp/managementgen/CMakeLists.txt
similarity index 100%
rename from cpp/managementgen/CMakeLists.txt
rename to qpid/cpp/managementgen/CMakeLists.txt
diff --git a/cpp/managementgen/Makefile.am b/qpid/cpp/managementgen/Makefile.am
similarity index 94%
rename from cpp/managementgen/Makefile.am
rename to qpid/cpp/managementgen/Makefile.am
index 6c2024c..8769200 100644
--- a/cpp/managementgen/Makefile.am
+++ b/qpid/cpp/managementgen/Makefile.am
@@ -19,7 +19,8 @@
 qmfpythondir = $(pythondir)
 dist_bin_SCRIPTS = \
 	qmf-gen
-nobase_qmfpython_DATA = \
+pkgpyexec_qmfgendir = $(pyexecdir)/qmfgen
+pkgpyexec_qmfgen_PYTHON = \
 	qmfgen/__init__.py \
 	qmfgen/generate.py \
 	qmfgen/schema.py \
diff --git a/cpp/managementgen/qmf-gen b/qpid/cpp/managementgen/qmf-gen
similarity index 100%
rename from cpp/managementgen/qmf-gen
rename to qpid/cpp/managementgen/qmf-gen
diff --git a/cpp/managementgen/qmfgen/__init__.py b/qpid/cpp/managementgen/qmfgen/__init__.py
similarity index 100%
rename from cpp/managementgen/qmfgen/__init__.py
rename to qpid/cpp/managementgen/qmfgen/__init__.py
diff --git a/cpp/managementgen/qmfgen/generate.py b/qpid/cpp/managementgen/qmfgen/generate.py
similarity index 100%
rename from cpp/managementgen/qmfgen/generate.py
rename to qpid/cpp/managementgen/qmfgen/generate.py
diff --git a/cpp/managementgen/qmfgen/management-types.xml b/qpid/cpp/managementgen/qmfgen/management-types.xml
similarity index 100%
rename from cpp/managementgen/qmfgen/management-types.xml
rename to qpid/cpp/managementgen/qmfgen/management-types.xml
diff --git a/cpp/managementgen/qmfgen/schema.py b/qpid/cpp/managementgen/qmfgen/schema.py
similarity index 100%
rename from cpp/managementgen/qmfgen/schema.py
rename to qpid/cpp/managementgen/qmfgen/schema.py
diff --git a/cpp/managementgen/qmfgen/templates/Args.h b/qpid/cpp/managementgen/qmfgen/templates/Args.h
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Args.h
rename to qpid/cpp/managementgen/qmfgen/templates/Args.h
diff --git a/cpp/managementgen/qmfgen/templates/CMakeLists.cmake b/qpid/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/CMakeLists.cmake
rename to qpid/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
diff --git a/cpp/managementgen/qmfgen/templates/Class.cpp b/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Class.cpp
rename to qpid/cpp/managementgen/qmfgen/templates/Class.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Class.h b/qpid/cpp/managementgen/qmfgen/templates/Class.h
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Class.h
rename to qpid/cpp/managementgen/qmfgen/templates/Class.h
diff --git a/cpp/managementgen/qmfgen/templates/Event.cpp b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Event.cpp
rename to qpid/cpp/managementgen/qmfgen/templates/Event.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Event.h b/qpid/cpp/managementgen/qmfgen/templates/Event.h
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Event.h
rename to qpid/cpp/managementgen/qmfgen/templates/Event.h
diff --git a/cpp/managementgen/qmfgen/templates/Makefile.mk b/qpid/cpp/managementgen/qmfgen/templates/Makefile.mk
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Makefile.mk
rename to qpid/cpp/managementgen/qmfgen/templates/Makefile.mk
diff --git a/cpp/managementgen/qmfgen/templates/Package.cpp b/qpid/cpp/managementgen/qmfgen/templates/Package.cpp
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Package.cpp
rename to qpid/cpp/managementgen/qmfgen/templates/Package.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Package.h b/qpid/cpp/managementgen/qmfgen/templates/Package.h
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/Package.h
rename to qpid/cpp/managementgen/qmfgen/templates/Package.h
diff --git a/cpp/managementgen/qmfgen/templates/V2Package.cpp b/qpid/cpp/managementgen/qmfgen/templates/V2Package.cpp
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/V2Package.cpp
rename to qpid/cpp/managementgen/qmfgen/templates/V2Package.cpp
diff --git a/cpp/managementgen/qmfgen/templates/V2Package.h b/qpid/cpp/managementgen/qmfgen/templates/V2Package.h
similarity index 100%
rename from cpp/managementgen/qmfgen/templates/V2Package.h
rename to qpid/cpp/managementgen/qmfgen/templates/V2Package.h
diff --git a/cpp/packaging/NSIS/Makefile.am b/qpid/cpp/packaging/NSIS/Makefile.am
similarity index 100%
rename from cpp/packaging/NSIS/Makefile.am
rename to qpid/cpp/packaging/NSIS/Makefile.am
diff --git a/cpp/packaging/NSIS/qpid-icon.ico b/qpid/cpp/packaging/NSIS/qpid-icon.ico
similarity index 100%
rename from cpp/packaging/NSIS/qpid-icon.ico
rename to qpid/cpp/packaging/NSIS/qpid-icon.ico
Binary files differ
diff --git a/cpp/packaging/NSIS/qpid-icon.png b/qpid/cpp/packaging/NSIS/qpid-icon.png
similarity index 100%
rename from cpp/packaging/NSIS/qpid-icon.png
rename to qpid/cpp/packaging/NSIS/qpid-icon.png
Binary files differ
diff --git a/cpp/packaging/NSIS/qpid-install-banner.bmp b/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
similarity index 100%
rename from cpp/packaging/NSIS/qpid-install-banner.bmp
rename to qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
Binary files differ
diff --git a/cpp/packaging/NSIS/qpid-install-banner.png b/qpid/cpp/packaging/NSIS/qpid-install-banner.png
similarity index 100%
rename from cpp/packaging/NSIS/qpid-install-banner.png
rename to qpid/cpp/packaging/NSIS/qpid-install-banner.png
Binary files differ
diff --git a/cpp/qpid-autotools-install b/qpid/cpp/qpid-autotools-install
similarity index 100%
rename from cpp/qpid-autotools-install
rename to qpid/cpp/qpid-autotools-install
diff --git a/cpp/qpid-config.in b/qpid/cpp/qpid-config.in
similarity index 100%
rename from cpp/qpid-config.in
rename to qpid/cpp/qpid-config.in
diff --git a/cpp/rubygen/0-10/allsegmenttypes.rb b/qpid/cpp/rubygen/0-10/allsegmenttypes.rb
similarity index 100%
rename from cpp/rubygen/0-10/allsegmenttypes.rb
rename to qpid/cpp/rubygen/0-10/allsegmenttypes.rb
diff --git a/cpp/rubygen/0-10/exceptions.rb b/qpid/cpp/rubygen/0-10/exceptions.rb
similarity index 100%
rename from cpp/rubygen/0-10/exceptions.rb
rename to qpid/cpp/rubygen/0-10/exceptions.rb
diff --git a/cpp/rubygen/0-10/handlers.rb b/qpid/cpp/rubygen/0-10/handlers.rb
similarity index 100%
rename from cpp/rubygen/0-10/handlers.rb
rename to qpid/cpp/rubygen/0-10/handlers.rb
diff --git a/cpp/rubygen/0-10/specification.rb b/qpid/cpp/rubygen/0-10/specification.rb
similarity index 100%
rename from cpp/rubygen/0-10/specification.rb
rename to qpid/cpp/rubygen/0-10/specification.rb
diff --git a/cpp/rubygen/0-10/typecode.rb b/qpid/cpp/rubygen/0-10/typecode.rb
similarity index 100%
rename from cpp/rubygen/0-10/typecode.rb
rename to qpid/cpp/rubygen/0-10/typecode.rb
diff --git a/cpp/rubygen/MethodBodyDefaultVisitor.rb b/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb
similarity index 100%
rename from cpp/rubygen/MethodBodyDefaultVisitor.rb
rename to qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb
diff --git a/cpp/rubygen/README.txt b/qpid/cpp/rubygen/README.txt
similarity index 100%
rename from cpp/rubygen/README.txt
rename to qpid/cpp/rubygen/README.txt
diff --git a/cpp/rubygen/amqpgen.rb b/qpid/cpp/rubygen/amqpgen.rb
similarity index 100%
rename from cpp/rubygen/amqpgen.rb
rename to qpid/cpp/rubygen/amqpgen.rb
diff --git a/cpp/rubygen/cppgen.rb b/qpid/cpp/rubygen/cppgen.rb
similarity index 100%
rename from cpp/rubygen/cppgen.rb
rename to qpid/cpp/rubygen/cppgen.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
rename to qpid/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
rename to qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyFactory.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/MethodBodyFactory.rb
rename to qpid/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
diff --git a/cpp/rubygen/framing.0-10/Operations.rb b/qpid/cpp/rubygen/framing.0-10/Operations.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/Operations.rb
rename to qpid/cpp/rubygen/framing.0-10/Operations.rb
diff --git a/cpp/rubygen/framing.0-10/OperationsInvoker.rb b/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/OperationsInvoker.rb
rename to qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb
diff --git a/cpp/rubygen/framing.0-10/Proxy.rb b/qpid/cpp/rubygen/framing.0-10/Proxy.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/Proxy.rb
rename to qpid/cpp/rubygen/framing.0-10/Proxy.rb
diff --git a/cpp/rubygen/framing.0-10/Session.rb b/qpid/cpp/rubygen/framing.0-10/Session.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/Session.rb
rename to qpid/cpp/rubygen/framing.0-10/Session.rb
diff --git a/cpp/rubygen/framing.0-10/all_method_bodies.rb b/qpid/cpp/rubygen/framing.0-10/all_method_bodies.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/all_method_bodies.rb
rename to qpid/cpp/rubygen/framing.0-10/all_method_bodies.rb
diff --git a/cpp/rubygen/framing.0-10/constants.rb b/qpid/cpp/rubygen/framing.0-10/constants.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/constants.rb
rename to qpid/cpp/rubygen/framing.0-10/constants.rb
diff --git a/cpp/rubygen/framing.0-10/frame_body_lists.rb b/qpid/cpp/rubygen/framing.0-10/frame_body_lists.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/frame_body_lists.rb
rename to qpid/cpp/rubygen/framing.0-10/frame_body_lists.rb
diff --git a/cpp/rubygen/framing.0-10/structs.rb b/qpid/cpp/rubygen/framing.0-10/structs.rb
similarity index 100%
rename from cpp/rubygen/framing.0-10/structs.rb
rename to qpid/cpp/rubygen/framing.0-10/structs.rb
diff --git a/cpp/rubygen/generate b/qpid/cpp/rubygen/generate
similarity index 100%
rename from cpp/rubygen/generate
rename to qpid/cpp/rubygen/generate
diff --git a/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
similarity index 100%
rename from cpp/src/CMakeLists.txt
rename to qpid/cpp/src/CMakeLists.txt
diff --git a/cpp/src/CMakeWinVersions.cmake b/qpid/cpp/src/CMakeWinVersions.cmake
similarity index 100%
rename from cpp/src/CMakeWinVersions.cmake
rename to qpid/cpp/src/CMakeWinVersions.cmake
diff --git a/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
similarity index 100%
rename from cpp/src/Makefile.am
rename to qpid/cpp/src/Makefile.am
diff --git a/cpp/src/acl.mk b/qpid/cpp/src/acl.mk
similarity index 100%
rename from cpp/src/acl.mk
rename to qpid/cpp/src/acl.mk
diff --git a/cpp/src/cluster.cmake b/qpid/cpp/src/cluster.cmake
similarity index 100%
rename from cpp/src/cluster.cmake
rename to qpid/cpp/src/cluster.cmake
diff --git a/cpp/src/cluster.mk b/qpid/cpp/src/cluster.mk
similarity index 100%
rename from cpp/src/cluster.mk
rename to qpid/cpp/src/cluster.mk
diff --git a/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake
similarity index 100%
rename from cpp/src/config.h.cmake
rename to qpid/cpp/src/config.h.cmake
diff --git a/cpp/src/generate.sh b/qpid/cpp/src/generate.sh
similarity index 100%
rename from cpp/src/generate.sh
rename to qpid/cpp/src/generate.sh
diff --git a/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp
similarity index 100%
rename from cpp/src/posix/QpiddBroker.cpp
rename to qpid/cpp/src/posix/QpiddBroker.cpp
diff --git a/cpp/src/prof b/qpid/cpp/src/prof
similarity index 100%
rename from cpp/src/prof
rename to qpid/cpp/src/prof
diff --git a/cpp/src/qmf.mk b/qpid/cpp/src/qmf.mk
similarity index 100%
rename from cpp/src/qmf.mk
rename to qpid/cpp/src/qmf.mk
diff --git a/cpp/src/qmf/Agent.cpp b/qpid/cpp/src/qmf/Agent.cpp
similarity index 100%
rename from cpp/src/qmf/Agent.cpp
rename to qpid/cpp/src/qmf/Agent.cpp
diff --git a/cpp/src/qmf/AgentEvent.cpp b/qpid/cpp/src/qmf/AgentEvent.cpp
similarity index 100%
rename from cpp/src/qmf/AgentEvent.cpp
rename to qpid/cpp/src/qmf/AgentEvent.cpp
diff --git a/cpp/src/qmf/AgentEventImpl.h b/qpid/cpp/src/qmf/AgentEventImpl.h
similarity index 100%
rename from cpp/src/qmf/AgentEventImpl.h
rename to qpid/cpp/src/qmf/AgentEventImpl.h
diff --git a/cpp/src/qmf/AgentImpl.h b/qpid/cpp/src/qmf/AgentImpl.h
similarity index 100%
rename from cpp/src/qmf/AgentImpl.h
rename to qpid/cpp/src/qmf/AgentImpl.h
diff --git a/cpp/src/qmf/AgentSession.cpp b/qpid/cpp/src/qmf/AgentSession.cpp
similarity index 100%
rename from cpp/src/qmf/AgentSession.cpp
rename to qpid/cpp/src/qmf/AgentSession.cpp
diff --git a/cpp/src/qmf/AgentSubscription.cpp b/qpid/cpp/src/qmf/AgentSubscription.cpp
similarity index 100%
rename from cpp/src/qmf/AgentSubscription.cpp
rename to qpid/cpp/src/qmf/AgentSubscription.cpp
diff --git a/cpp/src/qmf/AgentSubscription.h b/qpid/cpp/src/qmf/AgentSubscription.h
similarity index 100%
rename from cpp/src/qmf/AgentSubscription.h
rename to qpid/cpp/src/qmf/AgentSubscription.h
diff --git a/cpp/src/qmf/ConsoleEvent.cpp b/qpid/cpp/src/qmf/ConsoleEvent.cpp
similarity index 100%
rename from cpp/src/qmf/ConsoleEvent.cpp
rename to qpid/cpp/src/qmf/ConsoleEvent.cpp
diff --git a/cpp/src/qmf/ConsoleEventImpl.h b/qpid/cpp/src/qmf/ConsoleEventImpl.h
similarity index 100%
rename from cpp/src/qmf/ConsoleEventImpl.h
rename to qpid/cpp/src/qmf/ConsoleEventImpl.h
diff --git a/cpp/src/qmf/ConsoleSession.cpp b/qpid/cpp/src/qmf/ConsoleSession.cpp
similarity index 100%
rename from cpp/src/qmf/ConsoleSession.cpp
rename to qpid/cpp/src/qmf/ConsoleSession.cpp
diff --git a/cpp/src/qmf/ConsoleSessionImpl.h b/qpid/cpp/src/qmf/ConsoleSessionImpl.h
similarity index 100%
rename from cpp/src/qmf/ConsoleSessionImpl.h
rename to qpid/cpp/src/qmf/ConsoleSessionImpl.h
diff --git a/cpp/src/qmf/Data.cpp b/qpid/cpp/src/qmf/Data.cpp
similarity index 100%
rename from cpp/src/qmf/Data.cpp
rename to qpid/cpp/src/qmf/Data.cpp
diff --git a/cpp/src/qmf/DataAddr.cpp b/qpid/cpp/src/qmf/DataAddr.cpp
similarity index 100%
rename from cpp/src/qmf/DataAddr.cpp
rename to qpid/cpp/src/qmf/DataAddr.cpp
diff --git a/cpp/src/qmf/DataAddrImpl.h b/qpid/cpp/src/qmf/DataAddrImpl.h
similarity index 100%
rename from cpp/src/qmf/DataAddrImpl.h
rename to qpid/cpp/src/qmf/DataAddrImpl.h
diff --git a/cpp/src/qmf/DataImpl.h b/qpid/cpp/src/qmf/DataImpl.h
similarity index 100%
rename from cpp/src/qmf/DataImpl.h
rename to qpid/cpp/src/qmf/DataImpl.h
diff --git a/cpp/src/qmf/Expression.cpp b/qpid/cpp/src/qmf/Expression.cpp
similarity index 100%
rename from cpp/src/qmf/Expression.cpp
rename to qpid/cpp/src/qmf/Expression.cpp
diff --git a/cpp/src/qmf/Expression.h b/qpid/cpp/src/qmf/Expression.h
similarity index 100%
rename from cpp/src/qmf/Expression.h
rename to qpid/cpp/src/qmf/Expression.h
diff --git a/cpp/src/qmf/Hash.cpp b/qpid/cpp/src/qmf/Hash.cpp
similarity index 100%
rename from cpp/src/qmf/Hash.cpp
rename to qpid/cpp/src/qmf/Hash.cpp
diff --git a/cpp/src/qmf/Hash.h b/qpid/cpp/src/qmf/Hash.h
similarity index 100%
rename from cpp/src/qmf/Hash.h
rename to qpid/cpp/src/qmf/Hash.h
diff --git a/cpp/src/qmf/PrivateImplRef.h b/qpid/cpp/src/qmf/PrivateImplRef.h
similarity index 100%
rename from cpp/src/qmf/PrivateImplRef.h
rename to qpid/cpp/src/qmf/PrivateImplRef.h
diff --git a/cpp/src/qmf/Query.cpp b/qpid/cpp/src/qmf/Query.cpp
similarity index 100%
rename from cpp/src/qmf/Query.cpp
rename to qpid/cpp/src/qmf/Query.cpp
diff --git a/cpp/src/qmf/QueryImpl.h b/qpid/cpp/src/qmf/QueryImpl.h
similarity index 100%
rename from cpp/src/qmf/QueryImpl.h
rename to qpid/cpp/src/qmf/QueryImpl.h
diff --git a/cpp/src/qmf/Schema.cpp b/qpid/cpp/src/qmf/Schema.cpp
similarity index 100%
rename from cpp/src/qmf/Schema.cpp
rename to qpid/cpp/src/qmf/Schema.cpp
diff --git a/cpp/src/qmf/SchemaCache.cpp b/qpid/cpp/src/qmf/SchemaCache.cpp
similarity index 100%
rename from cpp/src/qmf/SchemaCache.cpp
rename to qpid/cpp/src/qmf/SchemaCache.cpp
diff --git a/cpp/src/qmf/SchemaCache.h b/qpid/cpp/src/qmf/SchemaCache.h
similarity index 100%
rename from cpp/src/qmf/SchemaCache.h
rename to qpid/cpp/src/qmf/SchemaCache.h
diff --git a/cpp/src/qmf/SchemaId.cpp b/qpid/cpp/src/qmf/SchemaId.cpp
similarity index 100%
rename from cpp/src/qmf/SchemaId.cpp
rename to qpid/cpp/src/qmf/SchemaId.cpp
diff --git a/cpp/src/qmf/SchemaIdImpl.h b/qpid/cpp/src/qmf/SchemaIdImpl.h
similarity index 100%
rename from cpp/src/qmf/SchemaIdImpl.h
rename to qpid/cpp/src/qmf/SchemaIdImpl.h
diff --git a/cpp/src/qmf/SchemaImpl.h b/qpid/cpp/src/qmf/SchemaImpl.h
similarity index 100%
rename from cpp/src/qmf/SchemaImpl.h
rename to qpid/cpp/src/qmf/SchemaImpl.h
diff --git a/cpp/src/qmf/SchemaMethod.cpp b/qpid/cpp/src/qmf/SchemaMethod.cpp
similarity index 100%
rename from cpp/src/qmf/SchemaMethod.cpp
rename to qpid/cpp/src/qmf/SchemaMethod.cpp
diff --git a/cpp/src/qmf/SchemaMethodImpl.h b/qpid/cpp/src/qmf/SchemaMethodImpl.h
similarity index 100%
rename from cpp/src/qmf/SchemaMethodImpl.h
rename to qpid/cpp/src/qmf/SchemaMethodImpl.h
diff --git a/cpp/src/qmf/SchemaProperty.cpp b/qpid/cpp/src/qmf/SchemaProperty.cpp
similarity index 100%
rename from cpp/src/qmf/SchemaProperty.cpp
rename to qpid/cpp/src/qmf/SchemaProperty.cpp
diff --git a/cpp/src/qmf/SchemaPropertyImpl.h b/qpid/cpp/src/qmf/SchemaPropertyImpl.h
similarity index 100%
rename from cpp/src/qmf/SchemaPropertyImpl.h
rename to qpid/cpp/src/qmf/SchemaPropertyImpl.h
diff --git a/cpp/src/qmf/Subscription.cpp b/qpid/cpp/src/qmf/Subscription.cpp
similarity index 100%
rename from cpp/src/qmf/Subscription.cpp
rename to qpid/cpp/src/qmf/Subscription.cpp
diff --git a/cpp/src/qmf/SubscriptionImpl.h b/qpid/cpp/src/qmf/SubscriptionImpl.h
similarity index 100%
rename from cpp/src/qmf/SubscriptionImpl.h
rename to qpid/cpp/src/qmf/SubscriptionImpl.h
diff --git a/cpp/src/qmf/agentCapability.h b/qpid/cpp/src/qmf/agentCapability.h
similarity index 100%
rename from cpp/src/qmf/agentCapability.h
rename to qpid/cpp/src/qmf/agentCapability.h
diff --git a/cpp/src/qmf/constants.cpp b/qpid/cpp/src/qmf/constants.cpp
similarity index 100%
rename from cpp/src/qmf/constants.cpp
rename to qpid/cpp/src/qmf/constants.cpp
diff --git a/cpp/src/qmf/constants.h b/qpid/cpp/src/qmf/constants.h
similarity index 100%
rename from cpp/src/qmf/constants.h
rename to qpid/cpp/src/qmf/constants.h
diff --git a/cpp/src/qmf/engine/Agent.cpp b/qpid/cpp/src/qmf/engine/Agent.cpp
similarity index 100%
rename from cpp/src/qmf/engine/Agent.cpp
rename to qpid/cpp/src/qmf/engine/Agent.cpp
diff --git a/cpp/src/qmf/engine/BrokerProxyImpl.cpp b/qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/BrokerProxyImpl.cpp
rename to qpid/cpp/src/qmf/engine/BrokerProxyImpl.cpp
diff --git a/cpp/src/qmf/engine/BrokerProxyImpl.h b/qpid/cpp/src/qmf/engine/BrokerProxyImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/BrokerProxyImpl.h
rename to qpid/cpp/src/qmf/engine/BrokerProxyImpl.h
diff --git a/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp b/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/ConnectionSettingsImpl.cpp
rename to qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.cpp
diff --git a/cpp/src/qmf/engine/ConnectionSettingsImpl.h b/qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/ConnectionSettingsImpl.h
rename to qpid/cpp/src/qmf/engine/ConnectionSettingsImpl.h
diff --git a/cpp/src/qmf/engine/ConsoleImpl.cpp b/qpid/cpp/src/qmf/engine/ConsoleImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/ConsoleImpl.cpp
rename to qpid/cpp/src/qmf/engine/ConsoleImpl.cpp
diff --git a/cpp/src/qmf/engine/ConsoleImpl.h b/qpid/cpp/src/qmf/engine/ConsoleImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/ConsoleImpl.h
rename to qpid/cpp/src/qmf/engine/ConsoleImpl.h
diff --git a/cpp/src/qmf/engine/EventImpl.cpp b/qpid/cpp/src/qmf/engine/EventImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/EventImpl.cpp
rename to qpid/cpp/src/qmf/engine/EventImpl.cpp
diff --git a/cpp/src/qmf/engine/EventImpl.h b/qpid/cpp/src/qmf/engine/EventImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/EventImpl.h
rename to qpid/cpp/src/qmf/engine/EventImpl.h
diff --git a/cpp/src/qmf/engine/MessageImpl.cpp b/qpid/cpp/src/qmf/engine/MessageImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/MessageImpl.cpp
rename to qpid/cpp/src/qmf/engine/MessageImpl.cpp
diff --git a/cpp/src/qmf/engine/MessageImpl.h b/qpid/cpp/src/qmf/engine/MessageImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/MessageImpl.h
rename to qpid/cpp/src/qmf/engine/MessageImpl.h
diff --git a/cpp/src/qmf/engine/ObjectIdImpl.cpp b/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/ObjectIdImpl.cpp
rename to qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp
diff --git a/cpp/src/qmf/engine/ObjectIdImpl.h b/qpid/cpp/src/qmf/engine/ObjectIdImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/ObjectIdImpl.h
rename to qpid/cpp/src/qmf/engine/ObjectIdImpl.h
diff --git a/cpp/src/qmf/engine/ObjectImpl.cpp b/qpid/cpp/src/qmf/engine/ObjectImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/ObjectImpl.cpp
rename to qpid/cpp/src/qmf/engine/ObjectImpl.cpp
diff --git a/cpp/src/qmf/engine/ObjectImpl.h b/qpid/cpp/src/qmf/engine/ObjectImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/ObjectImpl.h
rename to qpid/cpp/src/qmf/engine/ObjectImpl.h
diff --git a/cpp/src/qmf/engine/Protocol.cpp b/qpid/cpp/src/qmf/engine/Protocol.cpp
similarity index 100%
rename from cpp/src/qmf/engine/Protocol.cpp
rename to qpid/cpp/src/qmf/engine/Protocol.cpp
diff --git a/cpp/src/qmf/engine/Protocol.h b/qpid/cpp/src/qmf/engine/Protocol.h
similarity index 100%
rename from cpp/src/qmf/engine/Protocol.h
rename to qpid/cpp/src/qmf/engine/Protocol.h
diff --git a/cpp/src/qmf/engine/QueryImpl.cpp b/qpid/cpp/src/qmf/engine/QueryImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/QueryImpl.cpp
rename to qpid/cpp/src/qmf/engine/QueryImpl.cpp
diff --git a/cpp/src/qmf/engine/QueryImpl.h b/qpid/cpp/src/qmf/engine/QueryImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/QueryImpl.h
rename to qpid/cpp/src/qmf/engine/QueryImpl.h
diff --git a/cpp/src/qmf/engine/ResilientConnection.cpp b/qpid/cpp/src/qmf/engine/ResilientConnection.cpp
similarity index 100%
rename from cpp/src/qmf/engine/ResilientConnection.cpp
rename to qpid/cpp/src/qmf/engine/ResilientConnection.cpp
diff --git a/cpp/src/qmf/engine/SchemaImpl.cpp b/qpid/cpp/src/qmf/engine/SchemaImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/SchemaImpl.cpp
rename to qpid/cpp/src/qmf/engine/SchemaImpl.cpp
diff --git a/cpp/src/qmf/engine/SchemaImpl.h b/qpid/cpp/src/qmf/engine/SchemaImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/SchemaImpl.h
rename to qpid/cpp/src/qmf/engine/SchemaImpl.h
diff --git a/cpp/src/qmf/engine/SequenceManager.cpp b/qpid/cpp/src/qmf/engine/SequenceManager.cpp
similarity index 100%
rename from cpp/src/qmf/engine/SequenceManager.cpp
rename to qpid/cpp/src/qmf/engine/SequenceManager.cpp
diff --git a/cpp/src/qmf/engine/SequenceManager.h b/qpid/cpp/src/qmf/engine/SequenceManager.h
similarity index 100%
rename from cpp/src/qmf/engine/SequenceManager.h
rename to qpid/cpp/src/qmf/engine/SequenceManager.h
diff --git a/cpp/src/qmf/engine/ValueImpl.cpp b/qpid/cpp/src/qmf/engine/ValueImpl.cpp
similarity index 100%
rename from cpp/src/qmf/engine/ValueImpl.cpp
rename to qpid/cpp/src/qmf/engine/ValueImpl.cpp
diff --git a/cpp/src/qmf/engine/ValueImpl.h b/qpid/cpp/src/qmf/engine/ValueImpl.h
similarity index 100%
rename from cpp/src/qmf/engine/ValueImpl.h
rename to qpid/cpp/src/qmf/engine/ValueImpl.h
diff --git a/cpp/src/qmf/exceptions.cpp b/qpid/cpp/src/qmf/exceptions.cpp
similarity index 100%
rename from cpp/src/qmf/exceptions.cpp
rename to qpid/cpp/src/qmf/exceptions.cpp
diff --git a/cpp/src/qmfc.mk b/qpid/cpp/src/qmfc.mk
similarity index 100%
rename from cpp/src/qmfc.mk
rename to qpid/cpp/src/qmfc.mk
diff --git a/cpp/src/qpid.pc.in b/qpid/cpp/src/qpid.pc.in
similarity index 100%
rename from cpp/src/qpid.pc.in
rename to qpid/cpp/src/qpid.pc.in
diff --git a/cpp/src/qpid/Address.cpp b/qpid/cpp/src/qpid/Address.cpp
similarity index 100%
rename from cpp/src/qpid/Address.cpp
rename to qpid/cpp/src/qpid/Address.cpp
diff --git a/cpp/src/qpid/BufferRef.h b/qpid/cpp/src/qpid/BufferRef.h
similarity index 100%
rename from cpp/src/qpid/BufferRef.h
rename to qpid/cpp/src/qpid/BufferRef.h
diff --git a/cpp/src/qpid/DataDir.cpp b/qpid/cpp/src/qpid/DataDir.cpp
similarity index 100%
rename from cpp/src/qpid/DataDir.cpp
rename to qpid/cpp/src/qpid/DataDir.cpp
diff --git a/cpp/src/qpid/DataDir.h b/qpid/cpp/src/qpid/DataDir.h
similarity index 100%
rename from cpp/src/qpid/DataDir.h
rename to qpid/cpp/src/qpid/DataDir.h
diff --git a/cpp/src/qpid/DisableExceptionLogging.h b/qpid/cpp/src/qpid/DisableExceptionLogging.h
similarity index 100%
rename from cpp/src/qpid/DisableExceptionLogging.h
rename to qpid/cpp/src/qpid/DisableExceptionLogging.h
diff --git a/cpp/src/qpid/Exception.cpp b/qpid/cpp/src/qpid/Exception.cpp
similarity index 100%
rename from cpp/src/qpid/Exception.cpp
rename to qpid/cpp/src/qpid/Exception.cpp
diff --git a/cpp/src/qpid/Modules.cpp b/qpid/cpp/src/qpid/Modules.cpp
similarity index 100%
rename from cpp/src/qpid/Modules.cpp
rename to qpid/cpp/src/qpid/Modules.cpp
diff --git a/cpp/src/qpid/Modules.h b/qpid/cpp/src/qpid/Modules.h
similarity index 100%
rename from cpp/src/qpid/Modules.h
rename to qpid/cpp/src/qpid/Modules.h
diff --git a/cpp/src/qpid/Options.cpp b/qpid/cpp/src/qpid/Options.cpp
similarity index 100%
rename from cpp/src/qpid/Options.cpp
rename to qpid/cpp/src/qpid/Options.cpp
diff --git a/cpp/src/qpid/Plugin.cpp b/qpid/cpp/src/qpid/Plugin.cpp
similarity index 100%
rename from cpp/src/qpid/Plugin.cpp
rename to qpid/cpp/src/qpid/Plugin.cpp
diff --git a/cpp/src/qpid/Plugin.h b/qpid/cpp/src/qpid/Plugin.h
similarity index 100%
rename from cpp/src/qpid/Plugin.h
rename to qpid/cpp/src/qpid/Plugin.h
diff --git a/cpp/src/qpid/RefCounted.h b/qpid/cpp/src/qpid/RefCounted.h
similarity index 100%
rename from cpp/src/qpid/RefCounted.h
rename to qpid/cpp/src/qpid/RefCounted.h
diff --git a/cpp/src/qpid/RefCountedBuffer.cpp b/qpid/cpp/src/qpid/RefCountedBuffer.cpp
similarity index 100%
rename from cpp/src/qpid/RefCountedBuffer.cpp
rename to qpid/cpp/src/qpid/RefCountedBuffer.cpp
diff --git a/cpp/src/qpid/RefCountedBuffer.h b/qpid/cpp/src/qpid/RefCountedBuffer.h
similarity index 100%
rename from cpp/src/qpid/RefCountedBuffer.h
rename to qpid/cpp/src/qpid/RefCountedBuffer.h
diff --git a/cpp/src/qpid/Sasl.h b/qpid/cpp/src/qpid/Sasl.h
similarity index 100%
rename from cpp/src/qpid/Sasl.h
rename to qpid/cpp/src/qpid/Sasl.h
diff --git a/cpp/src/qpid/SaslFactory.cpp b/qpid/cpp/src/qpid/SaslFactory.cpp
similarity index 100%
rename from cpp/src/qpid/SaslFactory.cpp
rename to qpid/cpp/src/qpid/SaslFactory.cpp
diff --git a/cpp/src/qpid/SaslFactory.h b/qpid/cpp/src/qpid/SaslFactory.h
similarity index 100%
rename from cpp/src/qpid/SaslFactory.h
rename to qpid/cpp/src/qpid/SaslFactory.h
diff --git a/cpp/src/qpid/Serializer.h b/qpid/cpp/src/qpid/Serializer.h
similarity index 100%
rename from cpp/src/qpid/Serializer.h
rename to qpid/cpp/src/qpid/Serializer.h
diff --git a/cpp/src/qpid/SessionId.cpp b/qpid/cpp/src/qpid/SessionId.cpp
similarity index 100%
rename from cpp/src/qpid/SessionId.cpp
rename to qpid/cpp/src/qpid/SessionId.cpp
diff --git a/cpp/src/qpid/SessionState.cpp b/qpid/cpp/src/qpid/SessionState.cpp
similarity index 100%
rename from cpp/src/qpid/SessionState.cpp
rename to qpid/cpp/src/qpid/SessionState.cpp
diff --git a/cpp/src/qpid/SessionState.h b/qpid/cpp/src/qpid/SessionState.h
similarity index 100%
rename from cpp/src/qpid/SessionState.h
rename to qpid/cpp/src/qpid/SessionState.h
diff --git a/cpp/src/qpid/SharedObject.h b/qpid/cpp/src/qpid/SharedObject.h
similarity index 100%
rename from cpp/src/qpid/SharedObject.h
rename to qpid/cpp/src/qpid/SharedObject.h
diff --git a/cpp/src/qpid/StringUtils.cpp b/qpid/cpp/src/qpid/StringUtils.cpp
similarity index 100%
rename from cpp/src/qpid/StringUtils.cpp
rename to qpid/cpp/src/qpid/StringUtils.cpp
diff --git a/cpp/src/qpid/StringUtils.h b/qpid/cpp/src/qpid/StringUtils.h
similarity index 100%
rename from cpp/src/qpid/StringUtils.h
rename to qpid/cpp/src/qpid/StringUtils.h
diff --git a/cpp/src/qpid/Url.cpp b/qpid/cpp/src/qpid/Url.cpp
similarity index 100%
rename from cpp/src/qpid/Url.cpp
rename to qpid/cpp/src/qpid/Url.cpp
diff --git a/cpp/src/qpid/Version.h b/qpid/cpp/src/qpid/Version.h
similarity index 100%
rename from cpp/src/qpid/Version.h
rename to qpid/cpp/src/qpid/Version.h
diff --git a/cpp/src/qpid/acl/Acl.cpp b/qpid/cpp/src/qpid/acl/Acl.cpp
similarity index 100%
rename from cpp/src/qpid/acl/Acl.cpp
rename to qpid/cpp/src/qpid/acl/Acl.cpp
diff --git a/cpp/src/qpid/acl/Acl.h b/qpid/cpp/src/qpid/acl/Acl.h
similarity index 100%
rename from cpp/src/qpid/acl/Acl.h
rename to qpid/cpp/src/qpid/acl/Acl.h
diff --git a/cpp/src/qpid/acl/AclData.cpp b/qpid/cpp/src/qpid/acl/AclData.cpp
similarity index 100%
rename from cpp/src/qpid/acl/AclData.cpp
rename to qpid/cpp/src/qpid/acl/AclData.cpp
diff --git a/cpp/src/qpid/acl/AclData.h b/qpid/cpp/src/qpid/acl/AclData.h
similarity index 100%
rename from cpp/src/qpid/acl/AclData.h
rename to qpid/cpp/src/qpid/acl/AclData.h
diff --git a/cpp/src/qpid/acl/AclPlugin.cpp b/qpid/cpp/src/qpid/acl/AclPlugin.cpp
similarity index 100%
rename from cpp/src/qpid/acl/AclPlugin.cpp
rename to qpid/cpp/src/qpid/acl/AclPlugin.cpp
diff --git a/cpp/src/qpid/acl/AclReader.cpp b/qpid/cpp/src/qpid/acl/AclReader.cpp
similarity index 100%
rename from cpp/src/qpid/acl/AclReader.cpp
rename to qpid/cpp/src/qpid/acl/AclReader.cpp
diff --git a/cpp/src/qpid/acl/AclReader.h b/qpid/cpp/src/qpid/acl/AclReader.h
similarity index 100%
rename from cpp/src/qpid/acl/AclReader.h
rename to qpid/cpp/src/qpid/acl/AclReader.h
diff --git a/cpp/src/qpid/acl/AclValidator.cpp b/qpid/cpp/src/qpid/acl/AclValidator.cpp
similarity index 100%
rename from cpp/src/qpid/acl/AclValidator.cpp
rename to qpid/cpp/src/qpid/acl/AclValidator.cpp
diff --git a/cpp/src/qpid/acl/AclValidator.h b/qpid/cpp/src/qpid/acl/AclValidator.h
similarity index 100%
rename from cpp/src/qpid/acl/AclValidator.h
rename to qpid/cpp/src/qpid/acl/AclValidator.h
diff --git a/cpp/src/qpid/acl/management-schema.xml b/qpid/cpp/src/qpid/acl/management-schema.xml
similarity index 100%
rename from cpp/src/qpid/acl/management-schema.xml
rename to qpid/cpp/src/qpid/acl/management-schema.xml
diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
similarity index 100%
rename from cpp/src/qpid/agent/ManagementAgentImpl.cpp
rename to qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.h b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
similarity index 100%
rename from cpp/src/qpid/agent/ManagementAgentImpl.h
rename to qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
diff --git a/cpp/src/qpid/amqp_0_10/Array.cpp b/qpid/cpp/src/qpid/amqp_0_10/Array.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Array.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/Array.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Array.h b/qpid/cpp/src/qpid/amqp_0_10/Array.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Array.h
rename to qpid/cpp/src/qpid/amqp_0_10/Array.h
diff --git a/cpp/src/qpid/amqp_0_10/Body.h b/qpid/cpp/src/qpid/amqp_0_10/Body.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Body.h
rename to qpid/cpp/src/qpid/amqp_0_10/Body.h
diff --git a/cpp/src/qpid/amqp_0_10/Codec.h b/qpid/cpp/src/qpid/amqp_0_10/Codec.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Codec.h
rename to qpid/cpp/src/qpid/amqp_0_10/Codec.h
diff --git a/cpp/src/qpid/amqp_0_10/Codecs.cpp b/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Codecs.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Command.h b/qpid/cpp/src/qpid/amqp_0_10/Command.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Command.h
rename to qpid/cpp/src/qpid/amqp_0_10/Command.h
diff --git a/cpp/src/qpid/amqp_0_10/CommmandPacker.h b/qpid/cpp/src/qpid/amqp_0_10/CommmandPacker.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/CommmandPacker.h
rename to qpid/cpp/src/qpid/amqp_0_10/CommmandPacker.h
diff --git a/cpp/src/qpid/amqp_0_10/Connection.cpp b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Connection.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Connection.h b/qpid/cpp/src/qpid/amqp_0_10/Connection.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Connection.h
rename to qpid/cpp/src/qpid/amqp_0_10/Connection.h
diff --git a/cpp/src/qpid/amqp_0_10/Control.h b/qpid/cpp/src/qpid/amqp_0_10/Control.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Control.h
rename to qpid/cpp/src/qpid/amqp_0_10/Control.h
diff --git a/cpp/src/qpid/amqp_0_10/Decimal.h b/qpid/cpp/src/qpid/amqp_0_10/Decimal.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Decimal.h
rename to qpid/cpp/src/qpid/amqp_0_10/Decimal.h
diff --git a/cpp/src/qpid/amqp_0_10/Exception.h b/qpid/cpp/src/qpid/amqp_0_10/Exception.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Exception.h
rename to qpid/cpp/src/qpid/amqp_0_10/Exception.h
diff --git a/cpp/src/qpid/amqp_0_10/FrameHeader.cpp b/qpid/cpp/src/qpid/amqp_0_10/FrameHeader.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/FrameHeader.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/FrameHeader.cpp
diff --git a/cpp/src/qpid/amqp_0_10/FrameHeader.h b/qpid/cpp/src/qpid/amqp_0_10/FrameHeader.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/FrameHeader.h
rename to qpid/cpp/src/qpid/amqp_0_10/FrameHeader.h
diff --git a/cpp/src/qpid/amqp_0_10/Header.cpp b/qpid/cpp/src/qpid/amqp_0_10/Header.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Header.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/Header.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Header.h b/qpid/cpp/src/qpid/amqp_0_10/Header.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Header.h
rename to qpid/cpp/src/qpid/amqp_0_10/Header.h
diff --git a/cpp/src/qpid/amqp_0_10/Holder.h b/qpid/cpp/src/qpid/amqp_0_10/Holder.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Holder.h
rename to qpid/cpp/src/qpid/amqp_0_10/Holder.h
diff --git a/cpp/src/qpid/amqp_0_10/Map.cpp b/qpid/cpp/src/qpid/amqp_0_10/Map.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Map.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/Map.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Map.h b/qpid/cpp/src/qpid/amqp_0_10/Map.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Map.h
rename to qpid/cpp/src/qpid/amqp_0_10/Map.h
diff --git a/cpp/src/qpid/amqp_0_10/Packer.h b/qpid/cpp/src/qpid/amqp_0_10/Packer.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Packer.h
rename to qpid/cpp/src/qpid/amqp_0_10/Packer.h
diff --git a/cpp/src/qpid/amqp_0_10/SerializableString.h b/qpid/cpp/src/qpid/amqp_0_10/SerializableString.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/SerializableString.h
rename to qpid/cpp/src/qpid/amqp_0_10/SerializableString.h
diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/SessionHandler.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.h b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/SessionHandler.h
rename to qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h
diff --git a/cpp/src/qpid/amqp_0_10/Struct.h b/qpid/cpp/src/qpid/amqp_0_10/Struct.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Struct.h
rename to qpid/cpp/src/qpid/amqp_0_10/Struct.h
diff --git a/cpp/src/qpid/amqp_0_10/Struct32.cpp b/qpid/cpp/src/qpid/amqp_0_10/Struct32.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Struct32.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/Struct32.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Struct32.h b/qpid/cpp/src/qpid/amqp_0_10/Struct32.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Struct32.h
rename to qpid/cpp/src/qpid/amqp_0_10/Struct32.h
diff --git a/cpp/src/qpid/amqp_0_10/Unit.cpp b/qpid/cpp/src/qpid/amqp_0_10/Unit.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Unit.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/Unit.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Unit.h b/qpid/cpp/src/qpid/amqp_0_10/Unit.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/Unit.h
rename to qpid/cpp/src/qpid/amqp_0_10/Unit.h
diff --git a/cpp/src/qpid/amqp_0_10/UnitHandler.h b/qpid/cpp/src/qpid/amqp_0_10/UnitHandler.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/UnitHandler.h
rename to qpid/cpp/src/qpid/amqp_0_10/UnitHandler.h
diff --git a/cpp/src/qpid/amqp_0_10/UnknownStruct.cpp b/qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/UnknownStruct.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.cpp
diff --git a/cpp/src/qpid/amqp_0_10/UnknownStruct.h b/qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/UnknownStruct.h
rename to qpid/cpp/src/qpid/amqp_0_10/UnknownStruct.h
diff --git a/cpp/src/qpid/amqp_0_10/UnknownType.cpp b/qpid/cpp/src/qpid/amqp_0_10/UnknownType.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/UnknownType.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/UnknownType.cpp
diff --git a/cpp/src/qpid/amqp_0_10/UnknownType.h b/qpid/cpp/src/qpid/amqp_0_10/UnknownType.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/UnknownType.h
rename to qpid/cpp/src/qpid/amqp_0_10/UnknownType.h
diff --git a/cpp/src/qpid/amqp_0_10/apply.h b/qpid/cpp/src/qpid/amqp_0_10/apply.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/apply.h
rename to qpid/cpp/src/qpid/amqp_0_10/apply.h
diff --git a/cpp/src/qpid/amqp_0_10/built_in_types.h b/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/built_in_types.h
rename to qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
diff --git a/cpp/src/qpid/amqp_0_10/complex_types.cpp b/qpid/cpp/src/qpid/amqp_0_10/complex_types.cpp
similarity index 100%
rename from cpp/src/qpid/amqp_0_10/complex_types.cpp
rename to qpid/cpp/src/qpid/amqp_0_10/complex_types.cpp
diff --git a/cpp/src/qpid/assert.cpp b/qpid/cpp/src/qpid/assert.cpp
similarity index 100%
rename from cpp/src/qpid/assert.cpp
rename to qpid/cpp/src/qpid/assert.cpp
diff --git a/cpp/src/qpid/assert.h b/qpid/cpp/src/qpid/assert.h
similarity index 100%
rename from cpp/src/qpid/assert.h
rename to qpid/cpp/src/qpid/assert.h
diff --git a/cpp/src/qpid/broker/AclModule.h b/qpid/cpp/src/qpid/broker/AclModule.h
similarity index 100%
rename from cpp/src/qpid/broker/AclModule.h
rename to qpid/cpp/src/qpid/broker/AclModule.h
diff --git a/cpp/src/qpid/broker/AsyncCompletion.h b/qpid/cpp/src/qpid/broker/AsyncCompletion.h
similarity index 100%
rename from cpp/src/qpid/broker/AsyncCompletion.h
rename to qpid/cpp/src/qpid/broker/AsyncCompletion.h
diff --git a/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp
similarity index 100%
rename from cpp/src/qpid/broker/Bridge.cpp
rename to qpid/cpp/src/qpid/broker/Bridge.cpp
diff --git a/cpp/src/qpid/broker/Bridge.h b/qpid/cpp/src/qpid/broker/Bridge.h
similarity index 100%
rename from cpp/src/qpid/broker/Bridge.h
rename to qpid/cpp/src/qpid/broker/Bridge.h
diff --git a/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
similarity index 99%
rename from cpp/src/qpid/broker/Broker.cpp
rename to qpid/cpp/src/qpid/broker/Broker.cpp
index 240766c..ca3be5b 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -701,7 +701,7 @@
 }
 
 void Broker::connect(
-    const std::string& host, uint16_t port, const std::string& transport,
+    const std::string& host, const std::string& port, const std::string& transport,
     boost::function2<void, int, std::string> failed,
     sys::ConnectionCodec::Factory* f)
 {
@@ -717,7 +717,7 @@
 {
     url.throwIfEmpty();
     const Address& addr=url[0];
-    connect(addr.host, addr.port, addr.protocol, failed, f);
+    connect(addr.host, boost::lexical_cast<std::string>(addr.port), addr.protocol, failed, f);
 }
 
 uint32_t Broker::queueMoveMessages(
diff --git a/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
similarity index 99%
rename from cpp/src/qpid/broker/Broker.h
rename to qpid/cpp/src/qpid/broker/Broker.h
index 6d585bf..40f7b62 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -244,7 +244,7 @@
     QPID_BROKER_EXTERN void accept();
 
     /** Create a connection to another broker. */
-    void connect(const std::string& host, uint16_t port,
+    void connect(const std::string& host, const std::string& port,
                  const std::string& transport,
                  boost::function2<void, int, std::string> failed,
                  sys::ConnectionCodec::Factory* =0);
diff --git a/cpp/src/qpid/broker/BrokerImportExport.h b/qpid/cpp/src/qpid/broker/BrokerImportExport.h
similarity index 100%
rename from cpp/src/qpid/broker/BrokerImportExport.h
rename to qpid/cpp/src/qpid/broker/BrokerImportExport.h
diff --git a/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
similarity index 100%
rename from cpp/src/qpid/broker/Connection.cpp
rename to qpid/cpp/src/qpid/broker/Connection.cpp
diff --git a/cpp/src/qpid/broker/Connection.h b/qpid/cpp/src/qpid/broker/Connection.h
similarity index 100%
rename from cpp/src/qpid/broker/Connection.h
rename to qpid/cpp/src/qpid/broker/Connection.h
diff --git a/cpp/src/qpid/broker/ConnectionFactory.cpp b/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
similarity index 100%
rename from cpp/src/qpid/broker/ConnectionFactory.cpp
rename to qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
diff --git a/cpp/src/qpid/broker/ConnectionFactory.h b/qpid/cpp/src/qpid/broker/ConnectionFactory.h
similarity index 100%
rename from cpp/src/qpid/broker/ConnectionFactory.h
rename to qpid/cpp/src/qpid/broker/ConnectionFactory.h
diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
similarity index 100%
rename from cpp/src/qpid/broker/ConnectionHandler.cpp
rename to qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
diff --git a/cpp/src/qpid/broker/ConnectionHandler.h b/qpid/cpp/src/qpid/broker/ConnectionHandler.h
similarity index 100%
rename from cpp/src/qpid/broker/ConnectionHandler.h
rename to qpid/cpp/src/qpid/broker/ConnectionHandler.h
diff --git a/cpp/src/qpid/broker/ConnectionState.h b/qpid/cpp/src/qpid/broker/ConnectionState.h
similarity index 100%
rename from cpp/src/qpid/broker/ConnectionState.h
rename to qpid/cpp/src/qpid/broker/ConnectionState.h
diff --git a/cpp/src/qpid/broker/ConnectionToken.h b/qpid/cpp/src/qpid/broker/ConnectionToken.h
similarity index 100%
rename from cpp/src/qpid/broker/ConnectionToken.h
rename to qpid/cpp/src/qpid/broker/ConnectionToken.h
diff --git a/cpp/src/qpid/broker/Consumer.h b/qpid/cpp/src/qpid/broker/Consumer.h
similarity index 100%
rename from cpp/src/qpid/broker/Consumer.h
rename to qpid/cpp/src/qpid/broker/Consumer.h
diff --git a/cpp/src/qpid/broker/Daemon.cpp b/qpid/cpp/src/qpid/broker/Daemon.cpp
similarity index 100%
rename from cpp/src/qpid/broker/Daemon.cpp
rename to qpid/cpp/src/qpid/broker/Daemon.cpp
diff --git a/cpp/src/qpid/broker/Daemon.h b/qpid/cpp/src/qpid/broker/Daemon.h
similarity index 100%
rename from cpp/src/qpid/broker/Daemon.h
rename to qpid/cpp/src/qpid/broker/Daemon.h
diff --git a/cpp/src/qpid/broker/Deliverable.h b/qpid/cpp/src/qpid/broker/Deliverable.h
similarity index 100%
rename from cpp/src/qpid/broker/Deliverable.h
rename to qpid/cpp/src/qpid/broker/Deliverable.h
diff --git a/cpp/src/qpid/broker/DeliverableMessage.cpp b/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DeliverableMessage.cpp
rename to qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
diff --git a/cpp/src/qpid/broker/DeliverableMessage.h b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
similarity index 100%
rename from cpp/src/qpid/broker/DeliverableMessage.h
rename to qpid/cpp/src/qpid/broker/DeliverableMessage.h
diff --git a/cpp/src/qpid/broker/DeliveryAdapter.h b/qpid/cpp/src/qpid/broker/DeliveryAdapter.h
similarity index 100%
rename from cpp/src/qpid/broker/DeliveryAdapter.h
rename to qpid/cpp/src/qpid/broker/DeliveryAdapter.h
diff --git a/cpp/src/qpid/broker/DeliveryId.h b/qpid/cpp/src/qpid/broker/DeliveryId.h
similarity index 100%
rename from cpp/src/qpid/broker/DeliveryId.h
rename to qpid/cpp/src/qpid/broker/DeliveryId.h
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DeliveryRecord.cpp
rename to qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
similarity index 100%
rename from cpp/src/qpid/broker/DeliveryRecord.h
rename to qpid/cpp/src/qpid/broker/DeliveryRecord.h
diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DirectExchange.cpp
rename to qpid/cpp/src/qpid/broker/DirectExchange.cpp
diff --git a/cpp/src/qpid/broker/DirectExchange.h b/qpid/cpp/src/qpid/broker/DirectExchange.h
similarity index 100%
rename from cpp/src/qpid/broker/DirectExchange.h
rename to qpid/cpp/src/qpid/broker/DirectExchange.h
diff --git a/cpp/src/qpid/broker/DtxAck.cpp b/qpid/cpp/src/qpid/broker/DtxAck.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DtxAck.cpp
rename to qpid/cpp/src/qpid/broker/DtxAck.cpp
diff --git a/cpp/src/qpid/broker/DtxAck.h b/qpid/cpp/src/qpid/broker/DtxAck.h
similarity index 100%
rename from cpp/src/qpid/broker/DtxAck.h
rename to qpid/cpp/src/qpid/broker/DtxAck.h
diff --git a/cpp/src/qpid/broker/DtxBuffer.cpp b/qpid/cpp/src/qpid/broker/DtxBuffer.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DtxBuffer.cpp
rename to qpid/cpp/src/qpid/broker/DtxBuffer.cpp
diff --git a/cpp/src/qpid/broker/DtxBuffer.h b/qpid/cpp/src/qpid/broker/DtxBuffer.h
similarity index 100%
rename from cpp/src/qpid/broker/DtxBuffer.h
rename to qpid/cpp/src/qpid/broker/DtxBuffer.h
diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/qpid/cpp/src/qpid/broker/DtxManager.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DtxManager.cpp
rename to qpid/cpp/src/qpid/broker/DtxManager.cpp
diff --git a/cpp/src/qpid/broker/DtxManager.h b/qpid/cpp/src/qpid/broker/DtxManager.h
similarity index 100%
rename from cpp/src/qpid/broker/DtxManager.h
rename to qpid/cpp/src/qpid/broker/DtxManager.h
diff --git a/cpp/src/qpid/broker/DtxTimeout.cpp b/qpid/cpp/src/qpid/broker/DtxTimeout.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DtxTimeout.cpp
rename to qpid/cpp/src/qpid/broker/DtxTimeout.cpp
diff --git a/cpp/src/qpid/broker/DtxTimeout.h b/qpid/cpp/src/qpid/broker/DtxTimeout.h
similarity index 100%
rename from cpp/src/qpid/broker/DtxTimeout.h
rename to qpid/cpp/src/qpid/broker/DtxTimeout.h
diff --git a/cpp/src/qpid/broker/DtxWorkRecord.cpp b/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
similarity index 100%
rename from cpp/src/qpid/broker/DtxWorkRecord.cpp
rename to qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
diff --git a/cpp/src/qpid/broker/DtxWorkRecord.h b/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
similarity index 100%
rename from cpp/src/qpid/broker/DtxWorkRecord.h
rename to qpid/cpp/src/qpid/broker/DtxWorkRecord.h
diff --git a/cpp/src/qpid/broker/Exchange.cpp b/qpid/cpp/src/qpid/broker/Exchange.cpp
similarity index 100%
rename from cpp/src/qpid/broker/Exchange.cpp
rename to qpid/cpp/src/qpid/broker/Exchange.cpp
diff --git a/cpp/src/qpid/broker/Exchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
similarity index 100%
rename from cpp/src/qpid/broker/Exchange.h
rename to qpid/cpp/src/qpid/broker/Exchange.h
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
similarity index 100%
rename from cpp/src/qpid/broker/ExchangeRegistry.cpp
rename to qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
similarity index 100%
rename from cpp/src/qpid/broker/ExchangeRegistry.h
rename to qpid/cpp/src/qpid/broker/ExchangeRegistry.h
diff --git a/cpp/src/qpid/broker/ExpiryPolicy.cpp b/qpid/cpp/src/qpid/broker/ExpiryPolicy.cpp
similarity index 100%
rename from cpp/src/qpid/broker/ExpiryPolicy.cpp
rename to qpid/cpp/src/qpid/broker/ExpiryPolicy.cpp
diff --git a/cpp/src/qpid/broker/ExpiryPolicy.h b/qpid/cpp/src/qpid/broker/ExpiryPolicy.h
similarity index 100%
rename from cpp/src/qpid/broker/ExpiryPolicy.h
rename to qpid/cpp/src/qpid/broker/ExpiryPolicy.h
diff --git a/cpp/src/qpid/broker/Fairshare.cpp b/qpid/cpp/src/qpid/broker/Fairshare.cpp
similarity index 100%
rename from cpp/src/qpid/broker/Fairshare.cpp
rename to qpid/cpp/src/qpid/broker/Fairshare.cpp
diff --git a/cpp/src/qpid/broker/Fairshare.h b/qpid/cpp/src/qpid/broker/Fairshare.h
similarity index 100%
rename from cpp/src/qpid/broker/Fairshare.h
rename to qpid/cpp/src/qpid/broker/Fairshare.h
diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
similarity index 100%
rename from cpp/src/qpid/broker/FanOutExchange.cpp
rename to qpid/cpp/src/qpid/broker/FanOutExchange.cpp
diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/qpid/cpp/src/qpid/broker/FanOutExchange.h
similarity index 100%
rename from cpp/src/qpid/broker/FanOutExchange.h
rename to qpid/cpp/src/qpid/broker/FanOutExchange.h
diff --git a/cpp/src/qpid/broker/FedOps.h b/qpid/cpp/src/qpid/broker/FedOps.h
similarity index 100%
rename from cpp/src/qpid/broker/FedOps.h
rename to qpid/cpp/src/qpid/broker/FedOps.h
diff --git a/cpp/src/qpid/broker/HandlerImpl.h b/qpid/cpp/src/qpid/broker/HandlerImpl.h
similarity index 100%
rename from cpp/src/qpid/broker/HandlerImpl.h
rename to qpid/cpp/src/qpid/broker/HandlerImpl.h
diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
similarity index 100%
rename from cpp/src/qpid/broker/HeadersExchange.cpp
rename to qpid/cpp/src/qpid/broker/HeadersExchange.cpp
diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/qpid/cpp/src/qpid/broker/HeadersExchange.h
similarity index 100%
rename from cpp/src/qpid/broker/HeadersExchange.h
rename to qpid/cpp/src/qpid/broker/HeadersExchange.h
diff --git a/cpp/src/qpid/broker/LegacyLVQ.cpp b/qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
similarity index 100%
rename from cpp/src/qpid/broker/LegacyLVQ.cpp
rename to qpid/cpp/src/qpid/broker/LegacyLVQ.cpp
diff --git a/cpp/src/qpid/broker/LegacyLVQ.h b/qpid/cpp/src/qpid/broker/LegacyLVQ.h
similarity index 100%
rename from cpp/src/qpid/broker/LegacyLVQ.h
rename to qpid/cpp/src/qpid/broker/LegacyLVQ.h
diff --git a/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp
similarity index 99%
rename from cpp/src/qpid/broker/Link.cpp
rename to qpid/cpp/src/qpid/broker/Link.cpp
index 91861ad..9ab4379 100644
--- a/cpp/src/qpid/broker/Link.cpp
+++ b/qpid/cpp/src/qpid/broker/Link.cpp
@@ -117,7 +117,7 @@
         // Set the state before calling connect.  It is possible that connect
         // will fail synchronously and call Link::closed before returning.
         setStateLH(STATE_CONNECTING);
-        broker->connect (host, port, transport,
+        broker->connect (host, boost::lexical_cast<std::string>(port), transport,
                          boost::bind (&Link::closed, this, _1, _2));
         QPID_LOG (debug, "Inter-broker link connecting to " << host << ":" << port);
     } catch(std::exception& e) {
diff --git a/cpp/src/qpid/broker/Link.h b/qpid/cpp/src/qpid/broker/Link.h
similarity index 100%
rename from cpp/src/qpid/broker/Link.h
rename to qpid/cpp/src/qpid/broker/Link.h
diff --git a/cpp/src/qpid/broker/LinkRegistry.cpp b/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
similarity index 100%
rename from cpp/src/qpid/broker/LinkRegistry.cpp
rename to qpid/cpp/src/qpid/broker/LinkRegistry.cpp
diff --git a/cpp/src/qpid/broker/LinkRegistry.h b/qpid/cpp/src/qpid/broker/LinkRegistry.h
similarity index 100%
rename from cpp/src/qpid/broker/LinkRegistry.h
rename to qpid/cpp/src/qpid/broker/LinkRegistry.h
diff --git a/cpp/src/qpid/broker/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp
similarity index 100%
rename from cpp/src/qpid/broker/Message.cpp
rename to qpid/cpp/src/qpid/broker/Message.cpp
diff --git a/cpp/src/qpid/broker/Message.h b/qpid/cpp/src/qpid/broker/Message.h
similarity index 100%
rename from cpp/src/qpid/broker/Message.h
rename to qpid/cpp/src/qpid/broker/Message.h
diff --git a/cpp/src/qpid/broker/MessageAdapter.cpp b/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
similarity index 100%
rename from cpp/src/qpid/broker/MessageAdapter.cpp
rename to qpid/cpp/src/qpid/broker/MessageAdapter.cpp
diff --git a/cpp/src/qpid/broker/MessageAdapter.h b/qpid/cpp/src/qpid/broker/MessageAdapter.h
similarity index 100%
rename from cpp/src/qpid/broker/MessageAdapter.h
rename to qpid/cpp/src/qpid/broker/MessageAdapter.h
diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
similarity index 100%
rename from cpp/src/qpid/broker/MessageBuilder.cpp
rename to qpid/cpp/src/qpid/broker/MessageBuilder.cpp
diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/qpid/cpp/src/qpid/broker/MessageBuilder.h
similarity index 100%
rename from cpp/src/qpid/broker/MessageBuilder.h
rename to qpid/cpp/src/qpid/broker/MessageBuilder.h
diff --git a/cpp/src/qpid/broker/MessageDeque.cpp b/qpid/cpp/src/qpid/broker/MessageDeque.cpp
similarity index 100%
rename from cpp/src/qpid/broker/MessageDeque.cpp
rename to qpid/cpp/src/qpid/broker/MessageDeque.cpp
diff --git a/cpp/src/qpid/broker/MessageDeque.h b/qpid/cpp/src/qpid/broker/MessageDeque.h
similarity index 100%
rename from cpp/src/qpid/broker/MessageDeque.h
rename to qpid/cpp/src/qpid/broker/MessageDeque.h
diff --git a/cpp/src/qpid/broker/MessageMap.cpp b/qpid/cpp/src/qpid/broker/MessageMap.cpp
similarity index 100%
rename from cpp/src/qpid/broker/MessageMap.cpp
rename to qpid/cpp/src/qpid/broker/MessageMap.cpp
diff --git a/cpp/src/qpid/broker/MessageMap.h b/qpid/cpp/src/qpid/broker/MessageMap.h
similarity index 100%
rename from cpp/src/qpid/broker/MessageMap.h
rename to qpid/cpp/src/qpid/broker/MessageMap.h
diff --git a/cpp/src/qpid/broker/MessageStore.h b/qpid/cpp/src/qpid/broker/MessageStore.h
similarity index 100%
rename from cpp/src/qpid/broker/MessageStore.h
rename to qpid/cpp/src/qpid/broker/MessageStore.h
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
similarity index 100%
rename from cpp/src/qpid/broker/MessageStoreModule.cpp
rename to qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
similarity index 100%
rename from cpp/src/qpid/broker/MessageStoreModule.h
rename to qpid/cpp/src/qpid/broker/MessageStoreModule.h
diff --git a/cpp/src/qpid/broker/Messages.h b/qpid/cpp/src/qpid/broker/Messages.h
similarity index 100%
rename from cpp/src/qpid/broker/Messages.h
rename to qpid/cpp/src/qpid/broker/Messages.h
diff --git a/cpp/src/qpid/broker/NameGenerator.cpp b/qpid/cpp/src/qpid/broker/NameGenerator.cpp
similarity index 100%
rename from cpp/src/qpid/broker/NameGenerator.cpp
rename to qpid/cpp/src/qpid/broker/NameGenerator.cpp
diff --git a/cpp/src/qpid/broker/NameGenerator.h b/qpid/cpp/src/qpid/broker/NameGenerator.h
similarity index 100%
rename from cpp/src/qpid/broker/NameGenerator.h
rename to qpid/cpp/src/qpid/broker/NameGenerator.h
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
similarity index 100%
rename from cpp/src/qpid/broker/NullMessageStore.cpp
rename to qpid/cpp/src/qpid/broker/NullMessageStore.cpp
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/qpid/cpp/src/qpid/broker/NullMessageStore.h
similarity index 100%
rename from cpp/src/qpid/broker/NullMessageStore.h
rename to qpid/cpp/src/qpid/broker/NullMessageStore.h
diff --git a/cpp/src/qpid/broker/OwnershipToken.h b/qpid/cpp/src/qpid/broker/OwnershipToken.h
similarity index 100%
rename from cpp/src/qpid/broker/OwnershipToken.h
rename to qpid/cpp/src/qpid/broker/OwnershipToken.h
diff --git a/cpp/src/qpid/broker/Persistable.h b/qpid/cpp/src/qpid/broker/Persistable.h
similarity index 100%
rename from cpp/src/qpid/broker/Persistable.h
rename to qpid/cpp/src/qpid/broker/Persistable.h
diff --git a/cpp/src/qpid/broker/PersistableConfig.h b/qpid/cpp/src/qpid/broker/PersistableConfig.h
similarity index 100%
rename from cpp/src/qpid/broker/PersistableConfig.h
rename to qpid/cpp/src/qpid/broker/PersistableConfig.h
diff --git a/cpp/src/qpid/broker/PersistableExchange.h b/qpid/cpp/src/qpid/broker/PersistableExchange.h
similarity index 100%
rename from cpp/src/qpid/broker/PersistableExchange.h
rename to qpid/cpp/src/qpid/broker/PersistableExchange.h
diff --git a/cpp/src/qpid/broker/PersistableMessage.cpp b/qpid/cpp/src/qpid/broker/PersistableMessage.cpp
similarity index 100%
rename from cpp/src/qpid/broker/PersistableMessage.cpp
rename to qpid/cpp/src/qpid/broker/PersistableMessage.cpp
diff --git a/cpp/src/qpid/broker/PersistableMessage.h b/qpid/cpp/src/qpid/broker/PersistableMessage.h
similarity index 100%
rename from cpp/src/qpid/broker/PersistableMessage.h
rename to qpid/cpp/src/qpid/broker/PersistableMessage.h
diff --git a/cpp/src/qpid/broker/PersistableQueue.h b/qpid/cpp/src/qpid/broker/PersistableQueue.h
similarity index 100%
rename from cpp/src/qpid/broker/PersistableQueue.h
rename to qpid/cpp/src/qpid/broker/PersistableQueue.h
diff --git a/cpp/src/qpid/broker/PriorityQueue.cpp b/qpid/cpp/src/qpid/broker/PriorityQueue.cpp
similarity index 100%
rename from cpp/src/qpid/broker/PriorityQueue.cpp
rename to qpid/cpp/src/qpid/broker/PriorityQueue.cpp
diff --git a/cpp/src/qpid/broker/PriorityQueue.h b/qpid/cpp/src/qpid/broker/PriorityQueue.h
similarity index 100%
rename from cpp/src/qpid/broker/PriorityQueue.h
rename to qpid/cpp/src/qpid/broker/PriorityQueue.h
diff --git a/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
similarity index 99%
rename from cpp/src/qpid/broker/Queue.cpp
rename to qpid/cpp/src/qpid/broker/Queue.cpp
index 8efa8be..789ad58 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -436,7 +436,7 @@
         std::deque<QueuedMessage> expired;
         {
             Mutex::ScopedLock locker(messageLock);
-            messages->removeIf(boost::bind(&collect_if_expired, expired, _1));
+            messages->removeIf(boost::bind(&collect_if_expired, boost::ref(expired), _1));
         }
         for_each(expired.begin(), expired.end(), boost::bind(&Queue::dequeue, this, (TransactionContext*) 0, _1));
     }
diff --git a/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
similarity index 100%
rename from cpp/src/qpid/broker/Queue.h
rename to qpid/cpp/src/qpid/broker/Queue.h
diff --git a/cpp/src/qpid/broker/QueueBindings.cpp b/qpid/cpp/src/qpid/broker/QueueBindings.cpp
similarity index 100%
rename from cpp/src/qpid/broker/QueueBindings.cpp
rename to qpid/cpp/src/qpid/broker/QueueBindings.cpp
diff --git a/cpp/src/qpid/broker/QueueBindings.h b/qpid/cpp/src/qpid/broker/QueueBindings.h
similarity index 100%
rename from cpp/src/qpid/broker/QueueBindings.h
rename to qpid/cpp/src/qpid/broker/QueueBindings.h
diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
similarity index 100%
rename from cpp/src/qpid/broker/QueueCleaner.cpp
rename to qpid/cpp/src/qpid/broker/QueueCleaner.cpp
diff --git a/cpp/src/qpid/broker/QueueCleaner.h b/qpid/cpp/src/qpid/broker/QueueCleaner.h
similarity index 100%
rename from cpp/src/qpid/broker/QueueCleaner.h
rename to qpid/cpp/src/qpid/broker/QueueCleaner.h
diff --git a/cpp/src/qpid/broker/QueueEvents.cpp b/qpid/cpp/src/qpid/broker/QueueEvents.cpp
similarity index 100%
rename from cpp/src/qpid/broker/QueueEvents.cpp
rename to qpid/cpp/src/qpid/broker/QueueEvents.cpp
diff --git a/cpp/src/qpid/broker/QueueEvents.h b/qpid/cpp/src/qpid/broker/QueueEvents.h
similarity index 100%
rename from cpp/src/qpid/broker/QueueEvents.h
rename to qpid/cpp/src/qpid/broker/QueueEvents.h
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.cpp b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
similarity index 100%
rename from cpp/src/qpid/broker/QueueFlowLimit.cpp
rename to qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.h b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
similarity index 100%
rename from cpp/src/qpid/broker/QueueFlowLimit.h
rename to qpid/cpp/src/qpid/broker/QueueFlowLimit.h
diff --git a/cpp/src/qpid/broker/QueueListeners.cpp b/qpid/cpp/src/qpid/broker/QueueListeners.cpp
similarity index 100%
rename from cpp/src/qpid/broker/QueueListeners.cpp
rename to qpid/cpp/src/qpid/broker/QueueListeners.cpp
diff --git a/cpp/src/qpid/broker/QueueListeners.h b/qpid/cpp/src/qpid/broker/QueueListeners.h
similarity index 100%
rename from cpp/src/qpid/broker/QueueListeners.h
rename to qpid/cpp/src/qpid/broker/QueueListeners.h
diff --git a/cpp/src/qpid/broker/QueueObserver.h b/qpid/cpp/src/qpid/broker/QueueObserver.h
similarity index 100%
rename from cpp/src/qpid/broker/QueueObserver.h
rename to qpid/cpp/src/qpid/broker/QueueObserver.h
diff --git a/cpp/src/qpid/broker/QueuePolicy.cpp b/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
similarity index 100%
rename from cpp/src/qpid/broker/QueuePolicy.cpp
rename to qpid/cpp/src/qpid/broker/QueuePolicy.cpp
diff --git a/cpp/src/qpid/broker/QueuePolicy.h b/qpid/cpp/src/qpid/broker/QueuePolicy.h
similarity index 100%
rename from cpp/src/qpid/broker/QueuePolicy.h
rename to qpid/cpp/src/qpid/broker/QueuePolicy.h
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
similarity index 100%
rename from cpp/src/qpid/broker/QueueRegistry.cpp
rename to qpid/cpp/src/qpid/broker/QueueRegistry.cpp
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/qpid/cpp/src/qpid/broker/QueueRegistry.h
similarity index 100%
rename from cpp/src/qpid/broker/QueueRegistry.h
rename to qpid/cpp/src/qpid/broker/QueueRegistry.h
diff --git a/cpp/src/qpid/broker/QueuedMessage.h b/qpid/cpp/src/qpid/broker/QueuedMessage.h
similarity index 100%
rename from cpp/src/qpid/broker/QueuedMessage.h
rename to qpid/cpp/src/qpid/broker/QueuedMessage.h
diff --git a/cpp/src/qpid/broker/RateFlowcontrol.h b/qpid/cpp/src/qpid/broker/RateFlowcontrol.h
similarity index 100%
rename from cpp/src/qpid/broker/RateFlowcontrol.h
rename to qpid/cpp/src/qpid/broker/RateFlowcontrol.h
diff --git a/cpp/src/qpid/broker/RateTracker.cpp b/qpid/cpp/src/qpid/broker/RateTracker.cpp
similarity index 100%
rename from cpp/src/qpid/broker/RateTracker.cpp
rename to qpid/cpp/src/qpid/broker/RateTracker.cpp
diff --git a/cpp/src/qpid/broker/RateTracker.h b/qpid/cpp/src/qpid/broker/RateTracker.h
similarity index 100%
rename from cpp/src/qpid/broker/RateTracker.h
rename to qpid/cpp/src/qpid/broker/RateTracker.h
diff --git a/cpp/src/qpid/broker/RecoverableConfig.h b/qpid/cpp/src/qpid/broker/RecoverableConfig.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoverableConfig.h
rename to qpid/cpp/src/qpid/broker/RecoverableConfig.h
diff --git a/cpp/src/qpid/broker/RecoverableExchange.h b/qpid/cpp/src/qpid/broker/RecoverableExchange.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoverableExchange.h
rename to qpid/cpp/src/qpid/broker/RecoverableExchange.h
diff --git a/cpp/src/qpid/broker/RecoverableMessage.h b/qpid/cpp/src/qpid/broker/RecoverableMessage.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoverableMessage.h
rename to qpid/cpp/src/qpid/broker/RecoverableMessage.h
diff --git a/cpp/src/qpid/broker/RecoverableQueue.h b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoverableQueue.h
rename to qpid/cpp/src/qpid/broker/RecoverableQueue.h
diff --git a/cpp/src/qpid/broker/RecoverableTransaction.h b/qpid/cpp/src/qpid/broker/RecoverableTransaction.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoverableTransaction.h
rename to qpid/cpp/src/qpid/broker/RecoverableTransaction.h
diff --git a/cpp/src/qpid/broker/RecoveredDequeue.cpp b/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
similarity index 100%
rename from cpp/src/qpid/broker/RecoveredDequeue.cpp
rename to qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
diff --git a/cpp/src/qpid/broker/RecoveredDequeue.h b/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoveredDequeue.h
rename to qpid/cpp/src/qpid/broker/RecoveredDequeue.h
diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.cpp b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
similarity index 100%
rename from cpp/src/qpid/broker/RecoveredEnqueue.cpp
rename to qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.h b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoveredEnqueue.h
rename to qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
diff --git a/cpp/src/qpid/broker/RecoveryManager.h b/qpid/cpp/src/qpid/broker/RecoveryManager.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoveryManager.h
rename to qpid/cpp/src/qpid/broker/RecoveryManager.h
diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
similarity index 100%
rename from cpp/src/qpid/broker/RecoveryManagerImpl.cpp
rename to qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.h b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h
similarity index 100%
rename from cpp/src/qpid/broker/RecoveryManagerImpl.h
rename to qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h
diff --git a/cpp/src/qpid/broker/RetryList.cpp b/qpid/cpp/src/qpid/broker/RetryList.cpp
similarity index 100%
rename from cpp/src/qpid/broker/RetryList.cpp
rename to qpid/cpp/src/qpid/broker/RetryList.cpp
diff --git a/cpp/src/qpid/broker/RetryList.h b/qpid/cpp/src/qpid/broker/RetryList.h
similarity index 100%
rename from cpp/src/qpid/broker/RetryList.h
rename to qpid/cpp/src/qpid/broker/RetryList.h
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SaslAuthenticator.cpp
rename to qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.h b/qpid/cpp/src/qpid/broker/SaslAuthenticator.h
similarity index 100%
rename from cpp/src/qpid/broker/SaslAuthenticator.h
rename to qpid/cpp/src/qpid/broker/SaslAuthenticator.h
diff --git a/cpp/src/qpid/broker/SecureConnection.cpp b/qpid/cpp/src/qpid/broker/SecureConnection.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SecureConnection.cpp
rename to qpid/cpp/src/qpid/broker/SecureConnection.cpp
diff --git a/cpp/src/qpid/broker/SecureConnection.h b/qpid/cpp/src/qpid/broker/SecureConnection.h
similarity index 100%
rename from cpp/src/qpid/broker/SecureConnection.h
rename to qpid/cpp/src/qpid/broker/SecureConnection.h
diff --git a/cpp/src/qpid/broker/SecureConnectionFactory.cpp b/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SecureConnectionFactory.cpp
rename to qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
diff --git a/cpp/src/qpid/broker/SecureConnectionFactory.h b/qpid/cpp/src/qpid/broker/SecureConnectionFactory.h
similarity index 100%
rename from cpp/src/qpid/broker/SecureConnectionFactory.h
rename to qpid/cpp/src/qpid/broker/SecureConnectionFactory.h
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SemanticState.cpp
rename to qpid/cpp/src/qpid/broker/SemanticState.cpp
diff --git a/cpp/src/qpid/broker/SemanticState.h b/qpid/cpp/src/qpid/broker/SemanticState.h
similarity index 100%
rename from cpp/src/qpid/broker/SemanticState.h
rename to qpid/cpp/src/qpid/broker/SemanticState.h
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SessionAdapter.cpp
rename to qpid/cpp/src/qpid/broker/SessionAdapter.cpp
diff --git a/cpp/src/qpid/broker/SessionAdapter.h b/qpid/cpp/src/qpid/broker/SessionAdapter.h
similarity index 100%
rename from cpp/src/qpid/broker/SessionAdapter.h
rename to qpid/cpp/src/qpid/broker/SessionAdapter.h
diff --git a/cpp/src/qpid/broker/SessionContext.h b/qpid/cpp/src/qpid/broker/SessionContext.h
similarity index 100%
rename from cpp/src/qpid/broker/SessionContext.h
rename to qpid/cpp/src/qpid/broker/SessionContext.h
diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/qpid/cpp/src/qpid/broker/SessionHandler.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SessionHandler.cpp
rename to qpid/cpp/src/qpid/broker/SessionHandler.cpp
diff --git a/cpp/src/qpid/broker/SessionHandler.h b/qpid/cpp/src/qpid/broker/SessionHandler.h
similarity index 100%
rename from cpp/src/qpid/broker/SessionHandler.h
rename to qpid/cpp/src/qpid/broker/SessionHandler.h
diff --git a/cpp/src/qpid/broker/SessionManager.cpp b/qpid/cpp/src/qpid/broker/SessionManager.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SessionManager.cpp
rename to qpid/cpp/src/qpid/broker/SessionManager.cpp
diff --git a/cpp/src/qpid/broker/SessionManager.h b/qpid/cpp/src/qpid/broker/SessionManager.h
similarity index 100%
rename from cpp/src/qpid/broker/SessionManager.h
rename to qpid/cpp/src/qpid/broker/SessionManager.h
diff --git a/cpp/src/qpid/broker/SessionOutputException.h b/qpid/cpp/src/qpid/broker/SessionOutputException.h
similarity index 100%
rename from cpp/src/qpid/broker/SessionOutputException.h
rename to qpid/cpp/src/qpid/broker/SessionOutputException.h
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
similarity index 99%
rename from cpp/src/qpid/broker/SessionState.cpp
rename to qpid/cpp/src/qpid/broker/SessionState.cpp
index 957d5bd..119e573 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
@@ -497,7 +497,9 @@
     qpid::sys::ScopedLock<qpid::sys::Mutex> l(completerLock);
     std::pair<SequenceNumber, boost::intrusive_ptr<Message> > item(msg->getCommandId(), msg);
     bool unique = pendingMsgs.insert(item).second;
-    assert(unique);
+    if (!unique) {
+      assert(false);
+    }
 }
 
 
diff --git a/cpp/src/qpid/broker/SessionState.h b/qpid/cpp/src/qpid/broker/SessionState.h
similarity index 100%
rename from cpp/src/qpid/broker/SessionState.h
rename to qpid/cpp/src/qpid/broker/SessionState.h
diff --git a/cpp/src/qpid/broker/SignalHandler.cpp b/qpid/cpp/src/qpid/broker/SignalHandler.cpp
similarity index 100%
rename from cpp/src/qpid/broker/SignalHandler.cpp
rename to qpid/cpp/src/qpid/broker/SignalHandler.cpp
diff --git a/cpp/src/qpid/broker/SignalHandler.h b/qpid/cpp/src/qpid/broker/SignalHandler.h
similarity index 100%
rename from cpp/src/qpid/broker/SignalHandler.h
rename to qpid/cpp/src/qpid/broker/SignalHandler.h
diff --git a/cpp/src/qpid/broker/StatefulQueueObserver.h b/qpid/cpp/src/qpid/broker/StatefulQueueObserver.h
similarity index 100%
rename from cpp/src/qpid/broker/StatefulQueueObserver.h
rename to qpid/cpp/src/qpid/broker/StatefulQueueObserver.h
diff --git a/cpp/src/qpid/broker/System.cpp b/qpid/cpp/src/qpid/broker/System.cpp
similarity index 100%
rename from cpp/src/qpid/broker/System.cpp
rename to qpid/cpp/src/qpid/broker/System.cpp
diff --git a/cpp/src/qpid/broker/System.h b/qpid/cpp/src/qpid/broker/System.h
similarity index 100%
rename from cpp/src/qpid/broker/System.h
rename to qpid/cpp/src/qpid/broker/System.h
diff --git a/cpp/src/qpid/broker/ThresholdAlerts.cpp b/qpid/cpp/src/qpid/broker/ThresholdAlerts.cpp
similarity index 100%
rename from cpp/src/qpid/broker/ThresholdAlerts.cpp
rename to qpid/cpp/src/qpid/broker/ThresholdAlerts.cpp
diff --git a/cpp/src/qpid/broker/ThresholdAlerts.h b/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
similarity index 100%
rename from cpp/src/qpid/broker/ThresholdAlerts.h
rename to qpid/cpp/src/qpid/broker/ThresholdAlerts.h
diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
similarity index 100%
rename from cpp/src/qpid/broker/TopicExchange.cpp
rename to qpid/cpp/src/qpid/broker/TopicExchange.cpp
diff --git a/cpp/src/qpid/broker/TopicExchange.h b/qpid/cpp/src/qpid/broker/TopicExchange.h
similarity index 100%
rename from cpp/src/qpid/broker/TopicExchange.h
rename to qpid/cpp/src/qpid/broker/TopicExchange.h
diff --git a/cpp/src/qpid/broker/TransactionalStore.h b/qpid/cpp/src/qpid/broker/TransactionalStore.h
similarity index 100%
rename from cpp/src/qpid/broker/TransactionalStore.h
rename to qpid/cpp/src/qpid/broker/TransactionalStore.h
diff --git a/cpp/src/qpid/broker/TxAccept.cpp b/qpid/cpp/src/qpid/broker/TxAccept.cpp
similarity index 100%
rename from cpp/src/qpid/broker/TxAccept.cpp
rename to qpid/cpp/src/qpid/broker/TxAccept.cpp
diff --git a/cpp/src/qpid/broker/TxAccept.h b/qpid/cpp/src/qpid/broker/TxAccept.h
similarity index 100%
rename from cpp/src/qpid/broker/TxAccept.h
rename to qpid/cpp/src/qpid/broker/TxAccept.h
diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/qpid/cpp/src/qpid/broker/TxBuffer.cpp
similarity index 100%
rename from cpp/src/qpid/broker/TxBuffer.cpp
rename to qpid/cpp/src/qpid/broker/TxBuffer.cpp
diff --git a/cpp/src/qpid/broker/TxBuffer.h b/qpid/cpp/src/qpid/broker/TxBuffer.h
similarity index 100%
rename from cpp/src/qpid/broker/TxBuffer.h
rename to qpid/cpp/src/qpid/broker/TxBuffer.h
diff --git a/cpp/src/qpid/broker/TxOp.h b/qpid/cpp/src/qpid/broker/TxOp.h
similarity index 100%
rename from cpp/src/qpid/broker/TxOp.h
rename to qpid/cpp/src/qpid/broker/TxOp.h
diff --git a/cpp/src/qpid/broker/TxOpVisitor.h b/qpid/cpp/src/qpid/broker/TxOpVisitor.h
similarity index 100%
rename from cpp/src/qpid/broker/TxOpVisitor.h
rename to qpid/cpp/src/qpid/broker/TxOpVisitor.h
diff --git a/cpp/src/qpid/broker/TxPublish.cpp b/qpid/cpp/src/qpid/broker/TxPublish.cpp
similarity index 100%
rename from cpp/src/qpid/broker/TxPublish.cpp
rename to qpid/cpp/src/qpid/broker/TxPublish.cpp
diff --git a/cpp/src/qpid/broker/TxPublish.h b/qpid/cpp/src/qpid/broker/TxPublish.h
similarity index 100%
rename from cpp/src/qpid/broker/TxPublish.h
rename to qpid/cpp/src/qpid/broker/TxPublish.h
diff --git a/cpp/src/qpid/broker/Vhost.cpp b/qpid/cpp/src/qpid/broker/Vhost.cpp
similarity index 100%
rename from cpp/src/qpid/broker/Vhost.cpp
rename to qpid/cpp/src/qpid/broker/Vhost.cpp
diff --git a/cpp/src/qpid/broker/Vhost.h b/qpid/cpp/src/qpid/broker/Vhost.h
similarity index 100%
rename from cpp/src/qpid/broker/Vhost.h
rename to qpid/cpp/src/qpid/broker/Vhost.h
diff --git a/cpp/src/qpid/broker/posix/BrokerDefaults.cpp b/qpid/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
similarity index 100%
rename from cpp/src/qpid/broker/posix/BrokerDefaults.cpp
rename to qpid/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
diff --git a/cpp/src/qpid/broker/windows/BrokerDefaults.cpp b/qpid/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
similarity index 100%
rename from cpp/src/qpid/broker/windows/BrokerDefaults.cpp
rename to qpid/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
diff --git a/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
similarity index 100%
rename from cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
rename to qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
diff --git a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
similarity index 97%
rename from cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
rename to qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
index fd0e537..676074a 100644
--- a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
@@ -81,12 +81,11 @@
     SslProtocolFactory(const SslServerOptions&, int backlog, bool nodelay);
     ~SslProtocolFactory();
     void accept(sys::Poller::shared_ptr, sys::ConnectionCodec::Factory*);
-    void connect(sys::Poller::shared_ptr, const std::string& host, int16_t port,
+    void connect(sys::Poller::shared_ptr, const std::string& host, const std::string& port,
                  sys::ConnectionCodec::Factory*,
                  ConnectFailedCallback failed);
 
     uint16_t getPort() const;
-    std::string getHost() const;
     bool supports(const std::string& capability);
 
   private:
@@ -130,7 +129,7 @@
                                        int backlog,
                                        bool nodelay)
     : tcpNoDelay(nodelay),
-      listeningPort(listener.listen(options.port, backlog)),
+    listeningPort(listener.listen("", boost::lexical_cast<std::string>(options.port), backlog)),
       clientAuthSelected(options.clientAuth) {
 
     SecInvalidateHandle(&credHandle);
@@ -237,10 +236,6 @@
     return listeningPort; // Immutable no need for lock.
 }
 
-std::string SslProtocolFactory::getHost() const {
-    return listener.getSockname();
-}
-
 void SslProtocolFactory::accept(sys::Poller::shared_ptr poller,
                                 sys::ConnectionCodec::Factory* fact) {
     acceptor.reset(
@@ -251,7 +246,7 @@
 
 void SslProtocolFactory::connect(sys::Poller::shared_ptr poller,
                                  const std::string& host,
-                                 int16_t port,
+                                 const std::string& port,
                                  sys::ConnectionCodec::Factory* fact,
                                  ConnectFailedCallback failed)
 {
diff --git a/cpp/src/qpid/client/Bounds.cpp b/qpid/cpp/src/qpid/client/Bounds.cpp
similarity index 100%
rename from cpp/src/qpid/client/Bounds.cpp
rename to qpid/cpp/src/qpid/client/Bounds.cpp
diff --git a/cpp/src/qpid/client/Bounds.h b/qpid/cpp/src/qpid/client/Bounds.h
similarity index 100%
rename from cpp/src/qpid/client/Bounds.h
rename to qpid/cpp/src/qpid/client/Bounds.h
diff --git a/cpp/src/qpid/client/ChainableFrameHandler.h b/qpid/cpp/src/qpid/client/ChainableFrameHandler.h
similarity index 100%
rename from cpp/src/qpid/client/ChainableFrameHandler.h
rename to qpid/cpp/src/qpid/client/ChainableFrameHandler.h
diff --git a/cpp/src/qpid/client/Completion.cpp b/qpid/cpp/src/qpid/client/Completion.cpp
similarity index 100%
rename from cpp/src/qpid/client/Completion.cpp
rename to qpid/cpp/src/qpid/client/Completion.cpp
diff --git a/cpp/src/qpid/client/CompletionImpl.h b/qpid/cpp/src/qpid/client/CompletionImpl.h
similarity index 100%
rename from cpp/src/qpid/client/CompletionImpl.h
rename to qpid/cpp/src/qpid/client/CompletionImpl.h
diff --git a/cpp/src/qpid/client/Connection.cpp b/qpid/cpp/src/qpid/client/Connection.cpp
similarity index 100%
rename from cpp/src/qpid/client/Connection.cpp
rename to qpid/cpp/src/qpid/client/Connection.cpp
diff --git a/cpp/src/qpid/client/ConnectionAccess.h b/qpid/cpp/src/qpid/client/ConnectionAccess.h
similarity index 100%
rename from cpp/src/qpid/client/ConnectionAccess.h
rename to qpid/cpp/src/qpid/client/ConnectionAccess.h
diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
similarity index 100%
rename from cpp/src/qpid/client/ConnectionHandler.cpp
rename to qpid/cpp/src/qpid/client/ConnectionHandler.cpp
diff --git a/cpp/src/qpid/client/ConnectionHandler.h b/qpid/cpp/src/qpid/client/ConnectionHandler.h
similarity index 100%
rename from cpp/src/qpid/client/ConnectionHandler.h
rename to qpid/cpp/src/qpid/client/ConnectionHandler.h
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
similarity index 98%
rename from cpp/src/qpid/client/ConnectionImpl.cpp
rename to qpid/cpp/src/qpid/client/ConnectionImpl.cpp
index 40c004f..4b7aa07 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -36,6 +36,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
+#include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <limits>
@@ -258,16 +259,16 @@
     connector->setInputHandler(&handler);
     connector->setShutdownHandler(this);
     try {
-        connector->connect(host, port);
-    
+        std::string p = boost::lexical_cast<std::string>(port);
+        connector->connect(host, p);
+
     } catch (const std::exception& e) {
         QPID_LOG(debug, "Failed to connect to " << protocol << ":" << host << ":" << port << " " << e.what());
         connector.reset();
         throw;
     }
     connector->init();
-    QPID_LOG(info, *this << " connected to " << protocol << ":" << host << ":" << port);
- 
+
     // Enable heartbeat if requested
     uint16_t heartbeat = static_cast<ConnectionSettings&>(handler).heartbeat;
     if (heartbeat) {
@@ -281,6 +282,7 @@
     // - in that case in connector.reset() above;
     // - or when we are deleted
     handler.waitForOpen();
+    QPID_LOG(info, *this << " connected to " << protocol << ":" << host << ":" << port);
 
     // If the SASL layer has provided an "operational" userId for the connection,
     // put it in the negotiated settings.
diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/qpid/cpp/src/qpid/client/ConnectionImpl.h
similarity index 100%
rename from cpp/src/qpid/client/ConnectionImpl.h
rename to qpid/cpp/src/qpid/client/ConnectionImpl.h
diff --git a/cpp/src/qpid/client/ConnectionSettings.cpp b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
similarity index 100%
rename from cpp/src/qpid/client/ConnectionSettings.cpp
rename to qpid/cpp/src/qpid/client/ConnectionSettings.cpp
diff --git a/cpp/src/qpid/client/Connector.cpp b/qpid/cpp/src/qpid/client/Connector.cpp
similarity index 100%
rename from cpp/src/qpid/client/Connector.cpp
rename to qpid/cpp/src/qpid/client/Connector.cpp
diff --git a/cpp/src/qpid/client/Connector.h b/qpid/cpp/src/qpid/client/Connector.h
similarity index 96%
rename from cpp/src/qpid/client/Connector.h
rename to qpid/cpp/src/qpid/client/Connector.h
index 586012f..bc611ff 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/qpid/cpp/src/qpid/client/Connector.h
@@ -61,7 +61,7 @@
     static void registerFactory(const std::string& proto, Factory* connectorFactory);
 
     virtual ~Connector() {};
-    virtual void connect(const std::string& host, int port) = 0;
+    virtual void connect(const std::string& host, const std::string& port) = 0;
     virtual void init() {};
     virtual void close() = 0;
     virtual void send(framing::AMQFrame& frame) = 0;
diff --git a/cpp/src/qpid/client/Demux.cpp b/qpid/cpp/src/qpid/client/Demux.cpp
similarity index 100%
rename from cpp/src/qpid/client/Demux.cpp
rename to qpid/cpp/src/qpid/client/Demux.cpp
diff --git a/cpp/src/qpid/client/Demux.h b/qpid/cpp/src/qpid/client/Demux.h
similarity index 100%
rename from cpp/src/qpid/client/Demux.h
rename to qpid/cpp/src/qpid/client/Demux.h
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/qpid/cpp/src/qpid/client/Dispatcher.cpp
similarity index 100%
rename from cpp/src/qpid/client/Dispatcher.cpp
rename to qpid/cpp/src/qpid/client/Dispatcher.cpp
diff --git a/cpp/src/qpid/client/Dispatcher.h b/qpid/cpp/src/qpid/client/Dispatcher.h
similarity index 100%
rename from cpp/src/qpid/client/Dispatcher.h
rename to qpid/cpp/src/qpid/client/Dispatcher.h
diff --git a/cpp/src/qpid/client/Execution.h b/qpid/cpp/src/qpid/client/Execution.h
similarity index 100%
rename from cpp/src/qpid/client/Execution.h
rename to qpid/cpp/src/qpid/client/Execution.h
diff --git a/cpp/src/qpid/client/FailoverListener.cpp b/qpid/cpp/src/qpid/client/FailoverListener.cpp
similarity index 100%
rename from cpp/src/qpid/client/FailoverListener.cpp
rename to qpid/cpp/src/qpid/client/FailoverListener.cpp
diff --git a/cpp/src/qpid/client/FailoverManager.cpp b/qpid/cpp/src/qpid/client/FailoverManager.cpp
similarity index 100%
rename from cpp/src/qpid/client/FailoverManager.cpp
rename to qpid/cpp/src/qpid/client/FailoverManager.cpp
diff --git a/cpp/src/qpid/client/Future.cpp b/qpid/cpp/src/qpid/client/Future.cpp
similarity index 100%
rename from cpp/src/qpid/client/Future.cpp
rename to qpid/cpp/src/qpid/client/Future.cpp
diff --git a/cpp/src/qpid/client/FutureCompletion.cpp b/qpid/cpp/src/qpid/client/FutureCompletion.cpp
similarity index 100%
rename from cpp/src/qpid/client/FutureCompletion.cpp
rename to qpid/cpp/src/qpid/client/FutureCompletion.cpp
diff --git a/cpp/src/qpid/client/FutureResult.cpp b/qpid/cpp/src/qpid/client/FutureResult.cpp
similarity index 100%
rename from cpp/src/qpid/client/FutureResult.cpp
rename to qpid/cpp/src/qpid/client/FutureResult.cpp
diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/qpid/cpp/src/qpid/client/LoadPlugins.cpp
similarity index 100%
rename from cpp/src/qpid/client/LoadPlugins.cpp
rename to qpid/cpp/src/qpid/client/LoadPlugins.cpp
diff --git a/cpp/src/qpid/client/LoadPlugins.h b/qpid/cpp/src/qpid/client/LoadPlugins.h
similarity index 100%
rename from cpp/src/qpid/client/LoadPlugins.h
rename to qpid/cpp/src/qpid/client/LoadPlugins.h
diff --git a/cpp/src/qpid/client/LocalQueue.cpp b/qpid/cpp/src/qpid/client/LocalQueue.cpp
similarity index 100%
rename from cpp/src/qpid/client/LocalQueue.cpp
rename to qpid/cpp/src/qpid/client/LocalQueue.cpp
diff --git a/cpp/src/qpid/client/LocalQueueImpl.cpp b/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/LocalQueueImpl.cpp
rename to qpid/cpp/src/qpid/client/LocalQueueImpl.cpp
diff --git a/cpp/src/qpid/client/LocalQueueImpl.h b/qpid/cpp/src/qpid/client/LocalQueueImpl.h
similarity index 100%
rename from cpp/src/qpid/client/LocalQueueImpl.h
rename to qpid/cpp/src/qpid/client/LocalQueueImpl.h
diff --git a/cpp/src/qpid/client/Message.cpp b/qpid/cpp/src/qpid/client/Message.cpp
similarity index 100%
rename from cpp/src/qpid/client/Message.cpp
rename to qpid/cpp/src/qpid/client/Message.cpp
diff --git a/cpp/src/qpid/client/MessageImpl.cpp b/qpid/cpp/src/qpid/client/MessageImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/MessageImpl.cpp
rename to qpid/cpp/src/qpid/client/MessageImpl.cpp
diff --git a/cpp/src/qpid/client/MessageImpl.h b/qpid/cpp/src/qpid/client/MessageImpl.h
similarity index 100%
rename from cpp/src/qpid/client/MessageImpl.h
rename to qpid/cpp/src/qpid/client/MessageImpl.h
diff --git a/cpp/src/qpid/client/MessageListener.cpp b/qpid/cpp/src/qpid/client/MessageListener.cpp
similarity index 100%
rename from cpp/src/qpid/client/MessageListener.cpp
rename to qpid/cpp/src/qpid/client/MessageListener.cpp
diff --git a/cpp/src/qpid/client/MessageReplayTracker.cpp b/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp
similarity index 100%
rename from cpp/src/qpid/client/MessageReplayTracker.cpp
rename to qpid/cpp/src/qpid/client/MessageReplayTracker.cpp
diff --git a/cpp/src/qpid/client/PrivateImplRef.h b/qpid/cpp/src/qpid/client/PrivateImplRef.h
similarity index 100%
rename from cpp/src/qpid/client/PrivateImplRef.h
rename to qpid/cpp/src/qpid/client/PrivateImplRef.h
diff --git a/cpp/src/qpid/client/QueueOptions.cpp b/qpid/cpp/src/qpid/client/QueueOptions.cpp
similarity index 100%
rename from cpp/src/qpid/client/QueueOptions.cpp
rename to qpid/cpp/src/qpid/client/QueueOptions.cpp
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
similarity index 98%
rename from cpp/src/qpid/client/RdmaConnector.cpp
rename to qpid/cpp/src/qpid/client/RdmaConnector.cpp
index 6af6071..664640f 100644
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
@@ -95,7 +95,7 @@
 
     std::string identifier;
 
-    void connect(const std::string& host, int port);
+    void connect(const std::string& host, const std::string& port);
     void close();
     void send(framing::AMQFrame& frame);
     void abort() {} // TODO: need to fix this for heartbeat timeouts to work
@@ -173,7 +173,7 @@
     }
 }
 
-void RdmaConnector::connect(const std::string& host, int port){
+void RdmaConnector::connect(const std::string& host, const std::string& port){
     Mutex::ScopedLock l(dataConnectedLock);
     assert(!dataConnected);
 
@@ -184,7 +184,7 @@
         boost::bind(&RdmaConnector::disconnected, this),
         boost::bind(&RdmaConnector::rejected, this, poller, _1, _2));
 
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
+    SocketAddress sa(host, port);
     acon->start(poller, sa);
 }
 
diff --git a/cpp/src/qpid/client/Results.cpp b/qpid/cpp/src/qpid/client/Results.cpp
similarity index 100%
rename from cpp/src/qpid/client/Results.cpp
rename to qpid/cpp/src/qpid/client/Results.cpp
diff --git a/cpp/src/qpid/client/Results.h b/qpid/cpp/src/qpid/client/Results.h
similarity index 100%
rename from cpp/src/qpid/client/Results.h
rename to qpid/cpp/src/qpid/client/Results.h
diff --git a/cpp/src/qpid/client/SessionBase_0_10.cpp b/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
similarity index 100%
rename from cpp/src/qpid/client/SessionBase_0_10.cpp
rename to qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
diff --git a/cpp/src/qpid/client/SessionBase_0_10Access.h b/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
similarity index 100%
rename from cpp/src/qpid/client/SessionBase_0_10Access.h
rename to qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/qpid/cpp/src/qpid/client/SessionImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/SessionImpl.cpp
rename to qpid/cpp/src/qpid/client/SessionImpl.cpp
diff --git a/cpp/src/qpid/client/SessionImpl.h b/qpid/cpp/src/qpid/client/SessionImpl.h
similarity index 100%
rename from cpp/src/qpid/client/SessionImpl.h
rename to qpid/cpp/src/qpid/client/SessionImpl.h
diff --git a/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp
similarity index 98%
rename from cpp/src/qpid/client/SslConnector.cpp
rename to qpid/cpp/src/qpid/client/SslConnector.cpp
index 35c7e6b..f121cfb 100644
--- a/cpp/src/qpid/client/SslConnector.cpp
+++ b/qpid/cpp/src/qpid/client/SslConnector.cpp
@@ -114,7 +114,7 @@
 
     std::string identifier;
 
-    void connect(const std::string& host, int port);
+    void connect(const std::string& host, const std::string& port);
     void init();
     void close();
     void send(framing::AMQFrame& frame);
@@ -190,7 +190,7 @@
     close();
 }
 
-void SslConnector::connect(const std::string& host, int port){
+void SslConnector::connect(const std::string& host, const std::string& port){
     Mutex::ScopedLock l(closedLock);
     assert(closed);
     try {
diff --git a/cpp/src/qpid/client/StateManager.cpp b/qpid/cpp/src/qpid/client/StateManager.cpp
similarity index 100%
rename from cpp/src/qpid/client/StateManager.cpp
rename to qpid/cpp/src/qpid/client/StateManager.cpp
diff --git a/cpp/src/qpid/client/StateManager.h b/qpid/cpp/src/qpid/client/StateManager.h
similarity index 100%
rename from cpp/src/qpid/client/StateManager.h
rename to qpid/cpp/src/qpid/client/StateManager.h
diff --git a/cpp/src/qpid/client/Subscription.cpp b/qpid/cpp/src/qpid/client/Subscription.cpp
similarity index 100%
rename from cpp/src/qpid/client/Subscription.cpp
rename to qpid/cpp/src/qpid/client/Subscription.cpp
diff --git a/cpp/src/qpid/client/SubscriptionImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/SubscriptionImpl.cpp
rename to qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
diff --git a/cpp/src/qpid/client/SubscriptionImpl.h b/qpid/cpp/src/qpid/client/SubscriptionImpl.h
similarity index 100%
rename from cpp/src/qpid/client/SubscriptionImpl.h
rename to qpid/cpp/src/qpid/client/SubscriptionImpl.h
diff --git a/cpp/src/qpid/client/SubscriptionManager.cpp b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
similarity index 100%
rename from cpp/src/qpid/client/SubscriptionManager.cpp
rename to qpid/cpp/src/qpid/client/SubscriptionManager.cpp
diff --git a/cpp/src/qpid/client/SubscriptionManagerImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/SubscriptionManagerImpl.cpp
rename to qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
diff --git a/cpp/src/qpid/client/SubscriptionManagerImpl.h b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h
similarity index 100%
rename from cpp/src/qpid/client/SubscriptionManagerImpl.h
rename to qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h
diff --git a/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp
similarity index 98%
rename from cpp/src/qpid/client/TCPConnector.cpp
rename to qpid/cpp/src/qpid/client/TCPConnector.cpp
index d90781b..0070b24 100644
--- a/cpp/src/qpid/client/TCPConnector.cpp
+++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp
@@ -88,7 +88,7 @@
     close();
 }
 
-void TCPConnector::connect(const std::string& host, int port) {
+void TCPConnector::connect(const std::string& host, const std::string& port) {
     Mutex::ScopedLock l(lock);
     assert(closed);
     connector = AsynchConnector::create(
@@ -121,7 +121,7 @@
         aio->queueReadBuffer(new Buff(maxFrameSize));
     }
 
-    identifier = str(format("[%1% %2%]") % socket.getLocalPort() % socket.getPeerAddress());
+    identifier = str(format("[%1%]") % socket.getFullAddress());
 }
 
 void TCPConnector::initAmqp() {
diff --git a/cpp/src/qpid/client/TCPConnector.h b/qpid/cpp/src/qpid/client/TCPConnector.h
similarity index 97%
rename from cpp/src/qpid/client/TCPConnector.h
rename to qpid/cpp/src/qpid/client/TCPConnector.h
index c756469..eb3f696 100644
--- a/cpp/src/qpid/client/TCPConnector.h
+++ b/qpid/cpp/src/qpid/client/TCPConnector.h
@@ -98,7 +98,7 @@
 
 protected:
     virtual ~TCPConnector();
-    void connect(const std::string& host, int port);
+    void connect(const std::string& host, const std::string& port);
     void start(sys::AsynchIO* aio_);
     void initAmqp();
     virtual void connectFailed(const std::string& msg);
diff --git a/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/AcceptTracker.h b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/AcceptTracker.h
rename to qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.h b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/AddressResolution.h
rename to qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
rename to qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.h b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/IncomingMessages.h
rename to qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
diff --git a/cpp/src/qpid/client/amqp0_10/MessageSink.h b/qpid/cpp/src/qpid/client/amqp0_10/MessageSink.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/MessageSink.h
rename to qpid/cpp/src/qpid/client/amqp0_10/MessageSink.h
diff --git a/cpp/src/qpid/client/amqp0_10/MessageSource.h b/qpid/cpp/src/qpid/client/amqp0_10/MessageSource.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/MessageSource.h
rename to qpid/cpp/src/qpid/client/amqp0_10/MessageSource.h
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
rename to qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
rename to qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/SenderImpl.h
rename to qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/SessionImpl.h
rename to qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
rename to qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h b/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
similarity index 100%
rename from cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
rename to qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
diff --git a/cpp/src/qpid/client/windows/SaslFactory.cpp b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
similarity index 100%
rename from cpp/src/qpid/client/windows/SaslFactory.cpp
rename to qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
diff --git a/cpp/src/qpid/client/windows/SslConnector.cpp b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
similarity index 97%
rename from cpp/src/qpid/client/windows/SslConnector.cpp
rename to qpid/cpp/src/qpid/client/windows/SslConnector.cpp
index a33713e..785c817 100644
--- a/cpp/src/qpid/client/windows/SslConnector.cpp
+++ b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
@@ -77,7 +77,7 @@
                  framing::ProtocolVersion pVersion,
                  const ConnectionSettings&, 
                  ConnectionImpl*);
-    virtual void connect(const std::string& host, int port);
+    virtual void connect(const std::string& host, const std::string& port);
     virtual void connected(const Socket&);
     unsigned int getSSF();
 };
@@ -153,7 +153,7 @@
 
   // Will this get reach via virtual method via boost::bind????
 
-void SslConnector::connect(const std::string& host, int port) {
+void SslConnector::connect(const std::string& host, const std::string& port) {
     brokerHost = host;
     TCPConnector::connect(host, port);
 }
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/Cluster.cpp
rename to qpid/cpp/src/qpid/cluster/Cluster.cpp
diff --git a/cpp/src/qpid/cluster/Cluster.h b/qpid/cpp/src/qpid/cluster/Cluster.h
similarity index 100%
rename from cpp/src/qpid/cluster/Cluster.h
rename to qpid/cpp/src/qpid/cluster/Cluster.h
diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/ClusterMap.cpp
rename to qpid/cpp/src/qpid/cluster/ClusterMap.cpp
diff --git a/cpp/src/qpid/cluster/ClusterMap.h b/qpid/cpp/src/qpid/cluster/ClusterMap.h
similarity index 100%
rename from cpp/src/qpid/cluster/ClusterMap.h
rename to qpid/cpp/src/qpid/cluster/ClusterMap.h
diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/ClusterPlugin.cpp
rename to qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
diff --git a/cpp/src/qpid/cluster/ClusterSettings.h b/qpid/cpp/src/qpid/cluster/ClusterSettings.h
similarity index 100%
rename from cpp/src/qpid/cluster/ClusterSettings.h
rename to qpid/cpp/src/qpid/cluster/ClusterSettings.h
diff --git a/cpp/src/qpid/cluster/ClusterTimer.cpp b/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/ClusterTimer.cpp
rename to qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
diff --git a/cpp/src/qpid/cluster/ClusterTimer.h b/qpid/cpp/src/qpid/cluster/ClusterTimer.h
similarity index 100%
rename from cpp/src/qpid/cluster/ClusterTimer.h
rename to qpid/cpp/src/qpid/cluster/ClusterTimer.h
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/qpid/cpp/src/qpid/cluster/Connection.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/Connection.cpp
rename to qpid/cpp/src/qpid/cluster/Connection.cpp
diff --git a/cpp/src/qpid/cluster/Connection.h b/qpid/cpp/src/qpid/cluster/Connection.h
similarity index 100%
rename from cpp/src/qpid/cluster/Connection.h
rename to qpid/cpp/src/qpid/cluster/Connection.h
diff --git a/cpp/src/qpid/cluster/ConnectionCodec.cpp b/qpid/cpp/src/qpid/cluster/ConnectionCodec.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/ConnectionCodec.cpp
rename to qpid/cpp/src/qpid/cluster/ConnectionCodec.cpp
diff --git a/cpp/src/qpid/cluster/ConnectionCodec.h b/qpid/cpp/src/qpid/cluster/ConnectionCodec.h
similarity index 100%
rename from cpp/src/qpid/cluster/ConnectionCodec.h
rename to qpid/cpp/src/qpid/cluster/ConnectionCodec.h
diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/qpid/cpp/src/qpid/cluster/Cpg.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/Cpg.cpp
rename to qpid/cpp/src/qpid/cluster/Cpg.cpp
diff --git a/cpp/src/qpid/cluster/Cpg.h b/qpid/cpp/src/qpid/cluster/Cpg.h
similarity index 100%
rename from cpp/src/qpid/cluster/Cpg.h
rename to qpid/cpp/src/qpid/cluster/Cpg.h
diff --git a/cpp/src/qpid/cluster/Decoder.cpp b/qpid/cpp/src/qpid/cluster/Decoder.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/Decoder.cpp
rename to qpid/cpp/src/qpid/cluster/Decoder.cpp
diff --git a/cpp/src/qpid/cluster/Decoder.h b/qpid/cpp/src/qpid/cluster/Decoder.h
similarity index 100%
rename from cpp/src/qpid/cluster/Decoder.h
rename to qpid/cpp/src/qpid/cluster/Decoder.h
diff --git a/cpp/src/qpid/cluster/Dispatchable.h b/qpid/cpp/src/qpid/cluster/Dispatchable.h
similarity index 100%
rename from cpp/src/qpid/cluster/Dispatchable.h
rename to qpid/cpp/src/qpid/cluster/Dispatchable.h
diff --git a/cpp/src/qpid/cluster/ErrorCheck.cpp b/qpid/cpp/src/qpid/cluster/ErrorCheck.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/ErrorCheck.cpp
rename to qpid/cpp/src/qpid/cluster/ErrorCheck.cpp
diff --git a/cpp/src/qpid/cluster/ErrorCheck.h b/qpid/cpp/src/qpid/cluster/ErrorCheck.h
similarity index 100%
rename from cpp/src/qpid/cluster/ErrorCheck.h
rename to qpid/cpp/src/qpid/cluster/ErrorCheck.h
diff --git a/cpp/src/qpid/cluster/Event.cpp b/qpid/cpp/src/qpid/cluster/Event.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/Event.cpp
rename to qpid/cpp/src/qpid/cluster/Event.cpp
diff --git a/cpp/src/qpid/cluster/Event.h b/qpid/cpp/src/qpid/cluster/Event.h
similarity index 100%
rename from cpp/src/qpid/cluster/Event.h
rename to qpid/cpp/src/qpid/cluster/Event.h
diff --git a/cpp/src/qpid/cluster/EventFrame.cpp b/qpid/cpp/src/qpid/cluster/EventFrame.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/EventFrame.cpp
rename to qpid/cpp/src/qpid/cluster/EventFrame.cpp
diff --git a/cpp/src/qpid/cluster/EventFrame.h b/qpid/cpp/src/qpid/cluster/EventFrame.h
similarity index 100%
rename from cpp/src/qpid/cluster/EventFrame.h
rename to qpid/cpp/src/qpid/cluster/EventFrame.h
diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/qpid/cpp/src/qpid/cluster/ExpiryPolicy.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/ExpiryPolicy.cpp
rename to qpid/cpp/src/qpid/cluster/ExpiryPolicy.cpp
diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.h b/qpid/cpp/src/qpid/cluster/ExpiryPolicy.h
similarity index 100%
rename from cpp/src/qpid/cluster/ExpiryPolicy.h
rename to qpid/cpp/src/qpid/cluster/ExpiryPolicy.h
diff --git a/cpp/src/qpid/cluster/FailoverExchange.cpp b/qpid/cpp/src/qpid/cluster/FailoverExchange.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/FailoverExchange.cpp
rename to qpid/cpp/src/qpid/cluster/FailoverExchange.cpp
diff --git a/cpp/src/qpid/cluster/FailoverExchange.h b/qpid/cpp/src/qpid/cluster/FailoverExchange.h
similarity index 100%
rename from cpp/src/qpid/cluster/FailoverExchange.h
rename to qpid/cpp/src/qpid/cluster/FailoverExchange.h
diff --git a/cpp/src/qpid/cluster/InitialStatusMap.cpp b/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/InitialStatusMap.cpp
rename to qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
diff --git a/cpp/src/qpid/cluster/InitialStatusMap.h b/qpid/cpp/src/qpid/cluster/InitialStatusMap.h
similarity index 100%
rename from cpp/src/qpid/cluster/InitialStatusMap.h
rename to qpid/cpp/src/qpid/cluster/InitialStatusMap.h
diff --git a/cpp/src/qpid/cluster/LockedConnectionMap.h b/qpid/cpp/src/qpid/cluster/LockedConnectionMap.h
similarity index 100%
rename from cpp/src/qpid/cluster/LockedConnectionMap.h
rename to qpid/cpp/src/qpid/cluster/LockedConnectionMap.h
diff --git a/cpp/src/qpid/cluster/McastFrameHandler.h b/qpid/cpp/src/qpid/cluster/McastFrameHandler.h
similarity index 100%
rename from cpp/src/qpid/cluster/McastFrameHandler.h
rename to qpid/cpp/src/qpid/cluster/McastFrameHandler.h
diff --git a/cpp/src/qpid/cluster/MemberSet.cpp b/qpid/cpp/src/qpid/cluster/MemberSet.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/MemberSet.cpp
rename to qpid/cpp/src/qpid/cluster/MemberSet.cpp
diff --git a/cpp/src/qpid/cluster/MemberSet.h b/qpid/cpp/src/qpid/cluster/MemberSet.h
similarity index 100%
rename from cpp/src/qpid/cluster/MemberSet.h
rename to qpid/cpp/src/qpid/cluster/MemberSet.h
diff --git a/cpp/src/qpid/cluster/Multicaster.cpp b/qpid/cpp/src/qpid/cluster/Multicaster.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/Multicaster.cpp
rename to qpid/cpp/src/qpid/cluster/Multicaster.cpp
diff --git a/cpp/src/qpid/cluster/Multicaster.h b/qpid/cpp/src/qpid/cluster/Multicaster.h
similarity index 100%
rename from cpp/src/qpid/cluster/Multicaster.h
rename to qpid/cpp/src/qpid/cluster/Multicaster.h
diff --git a/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h b/qpid/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h
similarity index 100%
rename from cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h
rename to qpid/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h
diff --git a/cpp/src/qpid/cluster/Numbering.h b/qpid/cpp/src/qpid/cluster/Numbering.h
similarity index 100%
rename from cpp/src/qpid/cluster/Numbering.h
rename to qpid/cpp/src/qpid/cluster/Numbering.h
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/OutputInterceptor.cpp
rename to qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.h b/qpid/cpp/src/qpid/cluster/OutputInterceptor.h
similarity index 100%
rename from cpp/src/qpid/cluster/OutputInterceptor.h
rename to qpid/cpp/src/qpid/cluster/OutputInterceptor.h
diff --git a/cpp/src/qpid/cluster/PollableQueue.h b/qpid/cpp/src/qpid/cluster/PollableQueue.h
similarity index 100%
rename from cpp/src/qpid/cluster/PollableQueue.h
rename to qpid/cpp/src/qpid/cluster/PollableQueue.h
diff --git a/cpp/src/qpid/cluster/PollerDispatch.cpp b/qpid/cpp/src/qpid/cluster/PollerDispatch.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/PollerDispatch.cpp
rename to qpid/cpp/src/qpid/cluster/PollerDispatch.cpp
diff --git a/cpp/src/qpid/cluster/PollerDispatch.h b/qpid/cpp/src/qpid/cluster/PollerDispatch.h
similarity index 100%
rename from cpp/src/qpid/cluster/PollerDispatch.h
rename to qpid/cpp/src/qpid/cluster/PollerDispatch.h
diff --git a/cpp/src/qpid/cluster/ProxyInputHandler.h b/qpid/cpp/src/qpid/cluster/ProxyInputHandler.h
similarity index 100%
rename from cpp/src/qpid/cluster/ProxyInputHandler.h
rename to qpid/cpp/src/qpid/cluster/ProxyInputHandler.h
diff --git a/cpp/src/qpid/cluster/Quorum.h b/qpid/cpp/src/qpid/cluster/Quorum.h
similarity index 100%
rename from cpp/src/qpid/cluster/Quorum.h
rename to qpid/cpp/src/qpid/cluster/Quorum.h
diff --git a/cpp/src/qpid/cluster/Quorum_cman.cpp b/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/Quorum_cman.cpp
rename to qpid/cpp/src/qpid/cluster/Quorum_cman.cpp
diff --git a/cpp/src/qpid/cluster/Quorum_cman.h b/qpid/cpp/src/qpid/cluster/Quorum_cman.h
similarity index 100%
rename from cpp/src/qpid/cluster/Quorum_cman.h
rename to qpid/cpp/src/qpid/cluster/Quorum_cman.h
diff --git a/cpp/src/qpid/cluster/Quorum_null.h b/qpid/cpp/src/qpid/cluster/Quorum_null.h
similarity index 100%
rename from cpp/src/qpid/cluster/Quorum_null.h
rename to qpid/cpp/src/qpid/cluster/Quorum_null.h
diff --git a/cpp/src/qpid/cluster/RetractClient.cpp b/qpid/cpp/src/qpid/cluster/RetractClient.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/RetractClient.cpp
rename to qpid/cpp/src/qpid/cluster/RetractClient.cpp
diff --git a/cpp/src/qpid/cluster/RetractClient.h b/qpid/cpp/src/qpid/cluster/RetractClient.h
similarity index 100%
rename from cpp/src/qpid/cluster/RetractClient.h
rename to qpid/cpp/src/qpid/cluster/RetractClient.h
diff --git a/cpp/src/qpid/cluster/SecureConnectionFactory.cpp b/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/SecureConnectionFactory.cpp
rename to qpid/cpp/src/qpid/cluster/SecureConnectionFactory.cpp
diff --git a/cpp/src/qpid/cluster/SecureConnectionFactory.h b/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.h
similarity index 100%
rename from cpp/src/qpid/cluster/SecureConnectionFactory.h
rename to qpid/cpp/src/qpid/cluster/SecureConnectionFactory.h
diff --git a/cpp/src/qpid/cluster/StoreStatus.cpp b/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/StoreStatus.cpp
rename to qpid/cpp/src/qpid/cluster/StoreStatus.cpp
diff --git a/cpp/src/qpid/cluster/StoreStatus.h b/qpid/cpp/src/qpid/cluster/StoreStatus.h
similarity index 100%
rename from cpp/src/qpid/cluster/StoreStatus.h
rename to qpid/cpp/src/qpid/cluster/StoreStatus.h
diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/UpdateClient.cpp
rename to qpid/cpp/src/qpid/cluster/UpdateClient.cpp
diff --git a/cpp/src/qpid/cluster/UpdateClient.h b/qpid/cpp/src/qpid/cluster/UpdateClient.h
similarity index 100%
rename from cpp/src/qpid/cluster/UpdateClient.h
rename to qpid/cpp/src/qpid/cluster/UpdateClient.h
diff --git a/cpp/src/qpid/cluster/UpdateDataExchange.cpp b/qpid/cpp/src/qpid/cluster/UpdateDataExchange.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/UpdateDataExchange.cpp
rename to qpid/cpp/src/qpid/cluster/UpdateDataExchange.cpp
diff --git a/cpp/src/qpid/cluster/UpdateDataExchange.h b/qpid/cpp/src/qpid/cluster/UpdateDataExchange.h
similarity index 100%
rename from cpp/src/qpid/cluster/UpdateDataExchange.h
rename to qpid/cpp/src/qpid/cluster/UpdateDataExchange.h
diff --git a/cpp/src/qpid/cluster/UpdateExchange.cpp b/qpid/cpp/src/qpid/cluster/UpdateExchange.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/UpdateExchange.cpp
rename to qpid/cpp/src/qpid/cluster/UpdateExchange.cpp
diff --git a/cpp/src/qpid/cluster/UpdateExchange.h b/qpid/cpp/src/qpid/cluster/UpdateExchange.h
similarity index 100%
rename from cpp/src/qpid/cluster/UpdateExchange.h
rename to qpid/cpp/src/qpid/cluster/UpdateExchange.h
diff --git a/cpp/src/qpid/cluster/UpdateReceiver.h b/qpid/cpp/src/qpid/cluster/UpdateReceiver.h
similarity index 100%
rename from cpp/src/qpid/cluster/UpdateReceiver.h
rename to qpid/cpp/src/qpid/cluster/UpdateReceiver.h
diff --git a/cpp/src/qpid/cluster/WatchDogPlugin.cpp b/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/WatchDogPlugin.cpp
rename to qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
diff --git a/cpp/src/qpid/cluster/management-schema.xml b/qpid/cpp/src/qpid/cluster/management-schema.xml
similarity index 100%
rename from cpp/src/qpid/cluster/management-schema.xml
rename to qpid/cpp/src/qpid/cluster/management-schema.xml
diff --git a/cpp/src/qpid/cluster/qpidd_watchdog.cpp b/qpid/cpp/src/qpid/cluster/qpidd_watchdog.cpp
similarity index 100%
rename from cpp/src/qpid/cluster/qpidd_watchdog.cpp
rename to qpid/cpp/src/qpid/cluster/qpidd_watchdog.cpp
diff --git a/cpp/src/qpid/cluster/types.h b/qpid/cpp/src/qpid/cluster/types.h
similarity index 100%
rename from cpp/src/qpid/cluster/types.h
rename to qpid/cpp/src/qpid/cluster/types.h
diff --git a/cpp/src/qpid/console/Agent.cpp b/qpid/cpp/src/qpid/console/Agent.cpp
similarity index 100%
rename from cpp/src/qpid/console/Agent.cpp
rename to qpid/cpp/src/qpid/console/Agent.cpp
diff --git a/cpp/src/qpid/console/Broker.cpp b/qpid/cpp/src/qpid/console/Broker.cpp
similarity index 100%
rename from cpp/src/qpid/console/Broker.cpp
rename to qpid/cpp/src/qpid/console/Broker.cpp
diff --git a/cpp/src/qpid/console/ClassKey.cpp b/qpid/cpp/src/qpid/console/ClassKey.cpp
similarity index 100%
rename from cpp/src/qpid/console/ClassKey.cpp
rename to qpid/cpp/src/qpid/console/ClassKey.cpp
diff --git a/cpp/src/qpid/console/Event.cpp b/qpid/cpp/src/qpid/console/Event.cpp
similarity index 100%
rename from cpp/src/qpid/console/Event.cpp
rename to qpid/cpp/src/qpid/console/Event.cpp
diff --git a/cpp/src/qpid/console/Object.cpp b/qpid/cpp/src/qpid/console/Object.cpp
similarity index 100%
rename from cpp/src/qpid/console/Object.cpp
rename to qpid/cpp/src/qpid/console/Object.cpp
diff --git a/cpp/src/qpid/console/ObjectId.cpp b/qpid/cpp/src/qpid/console/ObjectId.cpp
similarity index 100%
rename from cpp/src/qpid/console/ObjectId.cpp
rename to qpid/cpp/src/qpid/console/ObjectId.cpp
diff --git a/cpp/src/qpid/console/Package.cpp b/qpid/cpp/src/qpid/console/Package.cpp
similarity index 100%
rename from cpp/src/qpid/console/Package.cpp
rename to qpid/cpp/src/qpid/console/Package.cpp
diff --git a/cpp/src/qpid/console/Schema.cpp b/qpid/cpp/src/qpid/console/Schema.cpp
similarity index 100%
rename from cpp/src/qpid/console/Schema.cpp
rename to qpid/cpp/src/qpid/console/Schema.cpp
diff --git a/cpp/src/qpid/console/SequenceManager.cpp b/qpid/cpp/src/qpid/console/SequenceManager.cpp
similarity index 100%
rename from cpp/src/qpid/console/SequenceManager.cpp
rename to qpid/cpp/src/qpid/console/SequenceManager.cpp
diff --git a/cpp/src/qpid/console/SessionManager.cpp b/qpid/cpp/src/qpid/console/SessionManager.cpp
similarity index 100%
rename from cpp/src/qpid/console/SessionManager.cpp
rename to qpid/cpp/src/qpid/console/SessionManager.cpp
diff --git a/cpp/src/qpid/console/Value.cpp b/qpid/cpp/src/qpid/console/Value.cpp
similarity index 100%
rename from cpp/src/qpid/console/Value.cpp
rename to qpid/cpp/src/qpid/console/Value.cpp
diff --git a/cpp/src/qpid/framing/AMQBody.cpp b/qpid/cpp/src/qpid/framing/AMQBody.cpp
similarity index 100%
rename from cpp/src/qpid/framing/AMQBody.cpp
rename to qpid/cpp/src/qpid/framing/AMQBody.cpp
diff --git a/cpp/src/qpid/framing/AMQBody.h b/qpid/cpp/src/qpid/framing/AMQBody.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQBody.h
rename to qpid/cpp/src/qpid/framing/AMQBody.h
diff --git a/cpp/src/qpid/framing/AMQCommandControlBody.h b/qpid/cpp/src/qpid/framing/AMQCommandControlBody.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQCommandControlBody.h
rename to qpid/cpp/src/qpid/framing/AMQCommandControlBody.h
diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
similarity index 100%
rename from cpp/src/qpid/framing/AMQContentBody.cpp
rename to qpid/cpp/src/qpid/framing/AMQContentBody.cpp
diff --git a/cpp/src/qpid/framing/AMQContentBody.h b/qpid/cpp/src/qpid/framing/AMQContentBody.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQContentBody.h
rename to qpid/cpp/src/qpid/framing/AMQContentBody.h
diff --git a/cpp/src/qpid/framing/AMQDataBlock.h b/qpid/cpp/src/qpid/framing/AMQDataBlock.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQDataBlock.h
rename to qpid/cpp/src/qpid/framing/AMQDataBlock.h
diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
similarity index 100%
rename from cpp/src/qpid/framing/AMQFrame.cpp
rename to qpid/cpp/src/qpid/framing/AMQFrame.cpp
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/qpid/cpp/src/qpid/framing/AMQFrame.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQFrame.h
rename to qpid/cpp/src/qpid/framing/AMQFrame.h
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
similarity index 100%
rename from cpp/src/qpid/framing/AMQHeaderBody.cpp
rename to qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQHeaderBody.h
rename to qpid/cpp/src/qpid/framing/AMQHeaderBody.h
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
similarity index 100%
rename from cpp/src/qpid/framing/AMQHeartbeatBody.cpp
rename to qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.h b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQHeartbeatBody.h
rename to qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
similarity index 100%
rename from cpp/src/qpid/framing/AMQMethodBody.cpp
rename to qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/qpid/cpp/src/qpid/framing/AMQMethodBody.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQMethodBody.h
rename to qpid/cpp/src/qpid/framing/AMQMethodBody.h
diff --git a/cpp/src/qpid/framing/AMQP_HighestVersion.h b/qpid/cpp/src/qpid/framing/AMQP_HighestVersion.h
similarity index 100%
rename from cpp/src/qpid/framing/AMQP_HighestVersion.h
rename to qpid/cpp/src/qpid/framing/AMQP_HighestVersion.h
diff --git a/cpp/src/qpid/framing/AccumulatedAck.cpp b/qpid/cpp/src/qpid/framing/AccumulatedAck.cpp
similarity index 100%
rename from cpp/src/qpid/framing/AccumulatedAck.cpp
rename to qpid/cpp/src/qpid/framing/AccumulatedAck.cpp
diff --git a/cpp/src/qpid/framing/AccumulatedAck.h b/qpid/cpp/src/qpid/framing/AccumulatedAck.h
similarity index 100%
rename from cpp/src/qpid/framing/AccumulatedAck.h
rename to qpid/cpp/src/qpid/framing/AccumulatedAck.h
diff --git a/cpp/src/qpid/framing/Array.cpp b/qpid/cpp/src/qpid/framing/Array.cpp
similarity index 100%
rename from cpp/src/qpid/framing/Array.cpp
rename to qpid/cpp/src/qpid/framing/Array.cpp
diff --git a/cpp/src/qpid/framing/Blob.cpp b/qpid/cpp/src/qpid/framing/Blob.cpp
similarity index 100%
rename from cpp/src/qpid/framing/Blob.cpp
rename to qpid/cpp/src/qpid/framing/Blob.cpp
diff --git a/cpp/src/qpid/framing/Blob.h b/qpid/cpp/src/qpid/framing/Blob.h
similarity index 100%
rename from cpp/src/qpid/framing/Blob.h
rename to qpid/cpp/src/qpid/framing/Blob.h
diff --git a/cpp/src/qpid/framing/BodyFactory.h b/qpid/cpp/src/qpid/framing/BodyFactory.h
similarity index 100%
rename from cpp/src/qpid/framing/BodyFactory.h
rename to qpid/cpp/src/qpid/framing/BodyFactory.h
diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/qpid/cpp/src/qpid/framing/BodyHandler.cpp
similarity index 100%
rename from cpp/src/qpid/framing/BodyHandler.cpp
rename to qpid/cpp/src/qpid/framing/BodyHandler.cpp
diff --git a/cpp/src/qpid/framing/BodyHandler.h b/qpid/cpp/src/qpid/framing/BodyHandler.h
similarity index 100%
rename from cpp/src/qpid/framing/BodyHandler.h
rename to qpid/cpp/src/qpid/framing/BodyHandler.h
diff --git a/cpp/src/qpid/framing/Buffer.cpp b/qpid/cpp/src/qpid/framing/Buffer.cpp
similarity index 100%
rename from cpp/src/qpid/framing/Buffer.cpp
rename to qpid/cpp/src/qpid/framing/Buffer.cpp
diff --git a/cpp/src/qpid/framing/ChannelHandler.h b/qpid/cpp/src/qpid/framing/ChannelHandler.h
similarity index 100%
rename from cpp/src/qpid/framing/ChannelHandler.h
rename to qpid/cpp/src/qpid/framing/ChannelHandler.h
diff --git a/cpp/src/qpid/framing/Endian.cpp b/qpid/cpp/src/qpid/framing/Endian.cpp
similarity index 100%
rename from cpp/src/qpid/framing/Endian.cpp
rename to qpid/cpp/src/qpid/framing/Endian.cpp
diff --git a/cpp/src/qpid/framing/Endian.h b/qpid/cpp/src/qpid/framing/Endian.h
similarity index 100%
rename from cpp/src/qpid/framing/Endian.h
rename to qpid/cpp/src/qpid/framing/Endian.h
diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/qpid/cpp/src/qpid/framing/FieldTable.cpp
similarity index 100%
rename from cpp/src/qpid/framing/FieldTable.cpp
rename to qpid/cpp/src/qpid/framing/FieldTable.cpp
diff --git a/cpp/src/qpid/framing/FieldValue.cpp b/qpid/cpp/src/qpid/framing/FieldValue.cpp
similarity index 100%
rename from cpp/src/qpid/framing/FieldValue.cpp
rename to qpid/cpp/src/qpid/framing/FieldValue.cpp
diff --git a/cpp/src/qpid/framing/FrameDecoder.cpp b/qpid/cpp/src/qpid/framing/FrameDecoder.cpp
similarity index 100%
rename from cpp/src/qpid/framing/FrameDecoder.cpp
rename to qpid/cpp/src/qpid/framing/FrameDecoder.cpp
diff --git a/cpp/src/qpid/framing/FrameDecoder.h b/qpid/cpp/src/qpid/framing/FrameDecoder.h
similarity index 100%
rename from cpp/src/qpid/framing/FrameDecoder.h
rename to qpid/cpp/src/qpid/framing/FrameDecoder.h
diff --git a/cpp/src/qpid/framing/FrameDefaultVisitor.h b/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
similarity index 100%
rename from cpp/src/qpid/framing/FrameDefaultVisitor.h
rename to qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
diff --git a/cpp/src/qpid/framing/FrameHandler.h b/qpid/cpp/src/qpid/framing/FrameHandler.h
similarity index 100%
rename from cpp/src/qpid/framing/FrameHandler.h
rename to qpid/cpp/src/qpid/framing/FrameHandler.h
diff --git a/cpp/src/qpid/framing/FrameSet.cpp b/qpid/cpp/src/qpid/framing/FrameSet.cpp
similarity index 100%
rename from cpp/src/qpid/framing/FrameSet.cpp
rename to qpid/cpp/src/qpid/framing/FrameSet.cpp
diff --git a/cpp/src/qpid/framing/FrameSet.h b/qpid/cpp/src/qpid/framing/FrameSet.h
similarity index 100%
rename from cpp/src/qpid/framing/FrameSet.h
rename to qpid/cpp/src/qpid/framing/FrameSet.h
diff --git a/cpp/src/qpid/framing/Handler.h b/qpid/cpp/src/qpid/framing/Handler.h
similarity index 100%
rename from cpp/src/qpid/framing/Handler.h
rename to qpid/cpp/src/qpid/framing/Handler.h
diff --git a/cpp/src/qpid/framing/HeaderProperties.h b/qpid/cpp/src/qpid/framing/HeaderProperties.h
similarity index 100%
rename from cpp/src/qpid/framing/HeaderProperties.h
rename to qpid/cpp/src/qpid/framing/HeaderProperties.h
diff --git a/cpp/src/qpid/framing/InitiationHandler.cpp b/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
similarity index 100%
rename from cpp/src/qpid/framing/InitiationHandler.cpp
rename to qpid/cpp/src/qpid/framing/InitiationHandler.cpp
diff --git a/cpp/src/qpid/framing/InitiationHandler.h b/qpid/cpp/src/qpid/framing/InitiationHandler.h
similarity index 100%
rename from cpp/src/qpid/framing/InitiationHandler.h
rename to qpid/cpp/src/qpid/framing/InitiationHandler.h
diff --git a/cpp/src/qpid/framing/InputHandler.h b/qpid/cpp/src/qpid/framing/InputHandler.h
similarity index 100%
rename from cpp/src/qpid/framing/InputHandler.h
rename to qpid/cpp/src/qpid/framing/InputHandler.h
diff --git a/cpp/src/qpid/framing/Invoker.h b/qpid/cpp/src/qpid/framing/Invoker.h
similarity index 100%
rename from cpp/src/qpid/framing/Invoker.h
rename to qpid/cpp/src/qpid/framing/Invoker.h
diff --git a/cpp/src/qpid/framing/IsInSequenceSet.h b/qpid/cpp/src/qpid/framing/IsInSequenceSet.h
similarity index 100%
rename from cpp/src/qpid/framing/IsInSequenceSet.h
rename to qpid/cpp/src/qpid/framing/IsInSequenceSet.h
diff --git a/cpp/src/qpid/framing/List.cpp b/qpid/cpp/src/qpid/framing/List.cpp
similarity index 100%
rename from cpp/src/qpid/framing/List.cpp
rename to qpid/cpp/src/qpid/framing/List.cpp
diff --git a/cpp/src/qpid/framing/MethodBodyFactory.h b/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
similarity index 100%
rename from cpp/src/qpid/framing/MethodBodyFactory.h
rename to qpid/cpp/src/qpid/framing/MethodBodyFactory.h
diff --git a/cpp/src/qpid/framing/MethodContent.h b/qpid/cpp/src/qpid/framing/MethodContent.h
similarity index 100%
rename from cpp/src/qpid/framing/MethodContent.h
rename to qpid/cpp/src/qpid/framing/MethodContent.h
diff --git a/cpp/src/qpid/framing/ModelMethod.h b/qpid/cpp/src/qpid/framing/ModelMethod.h
similarity index 100%
rename from cpp/src/qpid/framing/ModelMethod.h
rename to qpid/cpp/src/qpid/framing/ModelMethod.h
diff --git a/cpp/src/qpid/framing/OutputHandler.h b/qpid/cpp/src/qpid/framing/OutputHandler.h
similarity index 100%
rename from cpp/src/qpid/framing/OutputHandler.h
rename to qpid/cpp/src/qpid/framing/OutputHandler.h
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
similarity index 100%
rename from cpp/src/qpid/framing/ProtocolInitiation.cpp
rename to qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.h b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
similarity index 100%
rename from cpp/src/qpid/framing/ProtocolInitiation.h
rename to qpid/cpp/src/qpid/framing/ProtocolInitiation.h
diff --git a/cpp/src/qpid/framing/ProtocolVersion.cpp b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
similarity index 100%
rename from cpp/src/qpid/framing/ProtocolVersion.cpp
rename to qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
diff --git a/cpp/src/qpid/framing/Proxy.cpp b/qpid/cpp/src/qpid/framing/Proxy.cpp
similarity index 100%
rename from cpp/src/qpid/framing/Proxy.cpp
rename to qpid/cpp/src/qpid/framing/Proxy.cpp
diff --git a/cpp/src/qpid/framing/Proxy.h b/qpid/cpp/src/qpid/framing/Proxy.h
similarity index 100%
rename from cpp/src/qpid/framing/Proxy.h
rename to qpid/cpp/src/qpid/framing/Proxy.h
diff --git a/cpp/src/qpid/framing/ResizableBuffer.h b/qpid/cpp/src/qpid/framing/ResizableBuffer.h
similarity index 100%
rename from cpp/src/qpid/framing/ResizableBuffer.h
rename to qpid/cpp/src/qpid/framing/ResizableBuffer.h
diff --git a/cpp/src/qpid/framing/SendContent.cpp b/qpid/cpp/src/qpid/framing/SendContent.cpp
similarity index 100%
rename from cpp/src/qpid/framing/SendContent.cpp
rename to qpid/cpp/src/qpid/framing/SendContent.cpp
diff --git a/cpp/src/qpid/framing/SendContent.h b/qpid/cpp/src/qpid/framing/SendContent.h
similarity index 100%
rename from cpp/src/qpid/framing/SendContent.h
rename to qpid/cpp/src/qpid/framing/SendContent.h
diff --git a/cpp/src/qpid/framing/SequenceNumber.cpp b/qpid/cpp/src/qpid/framing/SequenceNumber.cpp
similarity index 100%
rename from cpp/src/qpid/framing/SequenceNumber.cpp
rename to qpid/cpp/src/qpid/framing/SequenceNumber.cpp
diff --git a/cpp/src/qpid/framing/SequenceNumberSet.cpp b/qpid/cpp/src/qpid/framing/SequenceNumberSet.cpp
similarity index 100%
rename from cpp/src/qpid/framing/SequenceNumberSet.cpp
rename to qpid/cpp/src/qpid/framing/SequenceNumberSet.cpp
diff --git a/cpp/src/qpid/framing/SequenceNumberSet.h b/qpid/cpp/src/qpid/framing/SequenceNumberSet.h
similarity index 100%
rename from cpp/src/qpid/framing/SequenceNumberSet.h
rename to qpid/cpp/src/qpid/framing/SequenceNumberSet.h
diff --git a/cpp/src/qpid/framing/SequenceSet.cpp b/qpid/cpp/src/qpid/framing/SequenceSet.cpp
similarity index 100%
rename from cpp/src/qpid/framing/SequenceSet.cpp
rename to qpid/cpp/src/qpid/framing/SequenceSet.cpp
diff --git a/cpp/src/qpid/framing/TemplateVisitor.h b/qpid/cpp/src/qpid/framing/TemplateVisitor.h
similarity index 100%
rename from cpp/src/qpid/framing/TemplateVisitor.h
rename to qpid/cpp/src/qpid/framing/TemplateVisitor.h
diff --git a/cpp/src/qpid/framing/TransferContent.cpp b/qpid/cpp/src/qpid/framing/TransferContent.cpp
similarity index 100%
rename from cpp/src/qpid/framing/TransferContent.cpp
rename to qpid/cpp/src/qpid/framing/TransferContent.cpp
diff --git a/cpp/src/qpid/framing/TransferContent.h b/qpid/cpp/src/qpid/framing/TransferContent.h
similarity index 100%
rename from cpp/src/qpid/framing/TransferContent.h
rename to qpid/cpp/src/qpid/framing/TransferContent.h
diff --git a/cpp/src/qpid/framing/TypeFilter.h b/qpid/cpp/src/qpid/framing/TypeFilter.h
similarity index 100%
rename from cpp/src/qpid/framing/TypeFilter.h
rename to qpid/cpp/src/qpid/framing/TypeFilter.h
diff --git a/cpp/src/qpid/framing/Uuid.cpp b/qpid/cpp/src/qpid/framing/Uuid.cpp
similarity index 100%
rename from cpp/src/qpid/framing/Uuid.cpp
rename to qpid/cpp/src/qpid/framing/Uuid.cpp
diff --git a/cpp/src/qpid/framing/Visitor.h b/qpid/cpp/src/qpid/framing/Visitor.h
similarity index 100%
rename from cpp/src/qpid/framing/Visitor.h
rename to qpid/cpp/src/qpid/framing/Visitor.h
diff --git a/cpp/src/qpid/framing/amqp_framing.h b/qpid/cpp/src/qpid/framing/amqp_framing.h
similarity index 100%
rename from cpp/src/qpid/framing/amqp_framing.h
rename to qpid/cpp/src/qpid/framing/amqp_framing.h
diff --git a/cpp/src/qpid/framing/frame_functors.h b/qpid/cpp/src/qpid/framing/frame_functors.h
similarity index 100%
rename from cpp/src/qpid/framing/frame_functors.h
rename to qpid/cpp/src/qpid/framing/frame_functors.h
diff --git a/cpp/src/qpid/framing/variant.h b/qpid/cpp/src/qpid/framing/variant.h
similarity index 100%
rename from cpp/src/qpid/framing/variant.h
rename to qpid/cpp/src/qpid/framing/variant.h
diff --git a/cpp/src/qpid/log/Helpers.h b/qpid/cpp/src/qpid/log/Helpers.h
similarity index 100%
rename from cpp/src/qpid/log/Helpers.h
rename to qpid/cpp/src/qpid/log/Helpers.h
diff --git a/cpp/src/qpid/log/Logger.cpp b/qpid/cpp/src/qpid/log/Logger.cpp
similarity index 100%
rename from cpp/src/qpid/log/Logger.cpp
rename to qpid/cpp/src/qpid/log/Logger.cpp
diff --git a/cpp/src/qpid/log/Options.cpp b/qpid/cpp/src/qpid/log/Options.cpp
similarity index 100%
rename from cpp/src/qpid/log/Options.cpp
rename to qpid/cpp/src/qpid/log/Options.cpp
diff --git a/cpp/src/qpid/log/OstreamOutput.cpp b/qpid/cpp/src/qpid/log/OstreamOutput.cpp
similarity index 100%
rename from cpp/src/qpid/log/OstreamOutput.cpp
rename to qpid/cpp/src/qpid/log/OstreamOutput.cpp
diff --git a/cpp/src/qpid/log/OstreamOutput.h b/qpid/cpp/src/qpid/log/OstreamOutput.h
similarity index 100%
rename from cpp/src/qpid/log/OstreamOutput.h
rename to qpid/cpp/src/qpid/log/OstreamOutput.h
diff --git a/cpp/src/qpid/log/Selector.cpp b/qpid/cpp/src/qpid/log/Selector.cpp
similarity index 100%
rename from cpp/src/qpid/log/Selector.cpp
rename to qpid/cpp/src/qpid/log/Selector.cpp
diff --git a/cpp/src/qpid/log/Statement.cpp b/qpid/cpp/src/qpid/log/Statement.cpp
similarity index 100%
rename from cpp/src/qpid/log/Statement.cpp
rename to qpid/cpp/src/qpid/log/Statement.cpp
diff --git a/cpp/src/qpid/log/posix/SinkOptions.cpp b/qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
similarity index 100%
rename from cpp/src/qpid/log/posix/SinkOptions.cpp
rename to qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
diff --git a/cpp/src/qpid/log/posix/SinkOptions.h b/qpid/cpp/src/qpid/log/posix/SinkOptions.h
similarity index 100%
rename from cpp/src/qpid/log/posix/SinkOptions.h
rename to qpid/cpp/src/qpid/log/posix/SinkOptions.h
diff --git a/cpp/src/qpid/log/windows/SinkOptions.cpp b/qpid/cpp/src/qpid/log/windows/SinkOptions.cpp
similarity index 100%
rename from cpp/src/qpid/log/windows/SinkOptions.cpp
rename to qpid/cpp/src/qpid/log/windows/SinkOptions.cpp
diff --git a/cpp/src/qpid/log/windows/SinkOptions.h b/qpid/cpp/src/qpid/log/windows/SinkOptions.h
similarity index 100%
rename from cpp/src/qpid/log/windows/SinkOptions.h
rename to qpid/cpp/src/qpid/log/windows/SinkOptions.h
diff --git a/cpp/src/qpid/management/Buffer.cpp b/qpid/cpp/src/qpid/management/Buffer.cpp
similarity index 100%
rename from cpp/src/qpid/management/Buffer.cpp
rename to qpid/cpp/src/qpid/management/Buffer.cpp
diff --git a/cpp/src/qpid/management/ConnectionSettings.cpp b/qpid/cpp/src/qpid/management/ConnectionSettings.cpp
similarity index 100%
rename from cpp/src/qpid/management/ConnectionSettings.cpp
rename to qpid/cpp/src/qpid/management/ConnectionSettings.cpp
diff --git a/cpp/src/qpid/management/Manageable.cpp b/qpid/cpp/src/qpid/management/Manageable.cpp
similarity index 100%
rename from cpp/src/qpid/management/Manageable.cpp
rename to qpid/cpp/src/qpid/management/Manageable.cpp
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
similarity index 100%
rename from cpp/src/qpid/management/ManagementAgent.cpp
rename to qpid/cpp/src/qpid/management/ManagementAgent.cpp
diff --git a/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h
similarity index 100%
rename from cpp/src/qpid/management/ManagementAgent.h
rename to qpid/cpp/src/qpid/management/ManagementAgent.h
diff --git a/cpp/src/qpid/management/ManagementDirectExchange.cpp b/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
similarity index 100%
rename from cpp/src/qpid/management/ManagementDirectExchange.cpp
rename to qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
diff --git a/cpp/src/qpid/management/ManagementDirectExchange.h b/qpid/cpp/src/qpid/management/ManagementDirectExchange.h
similarity index 100%
rename from cpp/src/qpid/management/ManagementDirectExchange.h
rename to qpid/cpp/src/qpid/management/ManagementDirectExchange.h
diff --git a/cpp/src/qpid/management/ManagementObject.cpp b/qpid/cpp/src/qpid/management/ManagementObject.cpp
similarity index 100%
rename from cpp/src/qpid/management/ManagementObject.cpp
rename to qpid/cpp/src/qpid/management/ManagementObject.cpp
diff --git a/cpp/src/qpid/management/ManagementTopicExchange.cpp b/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
similarity index 100%
rename from cpp/src/qpid/management/ManagementTopicExchange.cpp
rename to qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
diff --git a/cpp/src/qpid/management/ManagementTopicExchange.h b/qpid/cpp/src/qpid/management/ManagementTopicExchange.h
similarity index 100%
rename from cpp/src/qpid/management/ManagementTopicExchange.h
rename to qpid/cpp/src/qpid/management/ManagementTopicExchange.h
diff --git a/cpp/src/qpid/management/Mutex.cpp b/qpid/cpp/src/qpid/management/Mutex.cpp
similarity index 100%
rename from cpp/src/qpid/management/Mutex.cpp
rename to qpid/cpp/src/qpid/management/Mutex.cpp
diff --git a/cpp/src/qpid/memory.h b/qpid/cpp/src/qpid/memory.h
similarity index 100%
rename from cpp/src/qpid/memory.h
rename to qpid/cpp/src/qpid/memory.h
diff --git a/cpp/src/qpid/messaging/Address.cpp b/qpid/cpp/src/qpid/messaging/Address.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/Address.cpp
rename to qpid/cpp/src/qpid/messaging/Address.cpp
diff --git a/cpp/src/qpid/messaging/AddressParser.cpp b/qpid/cpp/src/qpid/messaging/AddressParser.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/AddressParser.cpp
rename to qpid/cpp/src/qpid/messaging/AddressParser.cpp
diff --git a/cpp/src/qpid/messaging/AddressParser.h b/qpid/cpp/src/qpid/messaging/AddressParser.h
similarity index 100%
rename from cpp/src/qpid/messaging/AddressParser.h
rename to qpid/cpp/src/qpid/messaging/AddressParser.h
diff --git a/cpp/src/qpid/messaging/Connection.cpp b/qpid/cpp/src/qpid/messaging/Connection.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/Connection.cpp
rename to qpid/cpp/src/qpid/messaging/Connection.cpp
diff --git a/cpp/src/qpid/messaging/ConnectionImpl.h b/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
similarity index 100%
rename from cpp/src/qpid/messaging/ConnectionImpl.h
rename to qpid/cpp/src/qpid/messaging/ConnectionImpl.h
diff --git a/cpp/src/qpid/messaging/Duration.cpp b/qpid/cpp/src/qpid/messaging/Duration.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/Duration.cpp
rename to qpid/cpp/src/qpid/messaging/Duration.cpp
diff --git a/cpp/src/qpid/messaging/FailoverUpdates.cpp b/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/FailoverUpdates.cpp
rename to qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp
diff --git a/cpp/src/qpid/messaging/HandleInstantiator.cpp b/qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/HandleInstantiator.cpp
rename to qpid/cpp/src/qpid/messaging/HandleInstantiator.cpp
diff --git a/cpp/src/qpid/messaging/Message.cpp b/qpid/cpp/src/qpid/messaging/Message.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/Message.cpp
rename to qpid/cpp/src/qpid/messaging/Message.cpp
diff --git a/cpp/src/qpid/messaging/MessageImpl.cpp b/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/MessageImpl.cpp
rename to qpid/cpp/src/qpid/messaging/MessageImpl.cpp
diff --git a/cpp/src/qpid/messaging/MessageImpl.h b/qpid/cpp/src/qpid/messaging/MessageImpl.h
similarity index 100%
rename from cpp/src/qpid/messaging/MessageImpl.h
rename to qpid/cpp/src/qpid/messaging/MessageImpl.h
diff --git a/cpp/src/qpid/messaging/PrivateImplRef.h b/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
similarity index 100%
rename from cpp/src/qpid/messaging/PrivateImplRef.h
rename to qpid/cpp/src/qpid/messaging/PrivateImplRef.h
diff --git a/cpp/src/qpid/messaging/Receiver.cpp b/qpid/cpp/src/qpid/messaging/Receiver.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/Receiver.cpp
rename to qpid/cpp/src/qpid/messaging/Receiver.cpp
diff --git a/cpp/src/qpid/messaging/ReceiverImpl.h b/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
similarity index 100%
rename from cpp/src/qpid/messaging/ReceiverImpl.h
rename to qpid/cpp/src/qpid/messaging/ReceiverImpl.h
diff --git a/cpp/src/qpid/messaging/Sender.cpp b/qpid/cpp/src/qpid/messaging/Sender.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/Sender.cpp
rename to qpid/cpp/src/qpid/messaging/Sender.cpp
diff --git a/cpp/src/qpid/messaging/SenderImpl.h b/qpid/cpp/src/qpid/messaging/SenderImpl.h
similarity index 100%
rename from cpp/src/qpid/messaging/SenderImpl.h
rename to qpid/cpp/src/qpid/messaging/SenderImpl.h
diff --git a/cpp/src/qpid/messaging/Session.cpp b/qpid/cpp/src/qpid/messaging/Session.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/Session.cpp
rename to qpid/cpp/src/qpid/messaging/Session.cpp
diff --git a/cpp/src/qpid/messaging/SessionImpl.h b/qpid/cpp/src/qpid/messaging/SessionImpl.h
similarity index 100%
rename from cpp/src/qpid/messaging/SessionImpl.h
rename to qpid/cpp/src/qpid/messaging/SessionImpl.h
diff --git a/cpp/src/qpid/messaging/exceptions.cpp b/qpid/cpp/src/qpid/messaging/exceptions.cpp
similarity index 100%
rename from cpp/src/qpid/messaging/exceptions.cpp
rename to qpid/cpp/src/qpid/messaging/exceptions.cpp
diff --git a/cpp/src/qpid/pointer_to_other.h b/qpid/cpp/src/qpid/pointer_to_other.h
similarity index 100%
rename from cpp/src/qpid/pointer_to_other.h
rename to qpid/cpp/src/qpid/pointer_to_other.h
diff --git a/cpp/src/qpid/ptr_map.h b/qpid/cpp/src/qpid/ptr_map.h
similarity index 100%
rename from cpp/src/qpid/ptr_map.h
rename to qpid/cpp/src/qpid/ptr_map.h
diff --git a/cpp/src/qpid/replication/ReplicatingEventListener.cpp b/qpid/cpp/src/qpid/replication/ReplicatingEventListener.cpp
similarity index 100%
rename from cpp/src/qpid/replication/ReplicatingEventListener.cpp
rename to qpid/cpp/src/qpid/replication/ReplicatingEventListener.cpp
diff --git a/cpp/src/qpid/replication/ReplicatingEventListener.h b/qpid/cpp/src/qpid/replication/ReplicatingEventListener.h
similarity index 100%
rename from cpp/src/qpid/replication/ReplicatingEventListener.h
rename to qpid/cpp/src/qpid/replication/ReplicatingEventListener.h
diff --git a/cpp/src/qpid/replication/ReplicationExchange.cpp b/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp
similarity index 100%
rename from cpp/src/qpid/replication/ReplicationExchange.cpp
rename to qpid/cpp/src/qpid/replication/ReplicationExchange.cpp
diff --git a/cpp/src/qpid/replication/ReplicationExchange.h b/qpid/cpp/src/qpid/replication/ReplicationExchange.h
similarity index 100%
rename from cpp/src/qpid/replication/ReplicationExchange.h
rename to qpid/cpp/src/qpid/replication/ReplicationExchange.h
diff --git a/cpp/src/qpid/replication/constants.h b/qpid/cpp/src/qpid/replication/constants.h
similarity index 100%
rename from cpp/src/qpid/replication/constants.h
rename to qpid/cpp/src/qpid/replication/constants.h
diff --git a/cpp/src/qpid/store/CMakeLists.txt b/qpid/cpp/src/qpid/store/CMakeLists.txt
similarity index 100%
rename from cpp/src/qpid/store/CMakeLists.txt
rename to qpid/cpp/src/qpid/store/CMakeLists.txt
diff --git a/cpp/src/qpid/store/MessageStorePlugin.cpp b/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp
similarity index 100%
rename from cpp/src/qpid/store/MessageStorePlugin.cpp
rename to qpid/cpp/src/qpid/store/MessageStorePlugin.cpp
diff --git a/cpp/src/qpid/store/MessageStorePlugin.h b/qpid/cpp/src/qpid/store/MessageStorePlugin.h
similarity index 100%
rename from cpp/src/qpid/store/MessageStorePlugin.h
rename to qpid/cpp/src/qpid/store/MessageStorePlugin.h
diff --git a/cpp/src/qpid/store/StorageProvider.h b/qpid/cpp/src/qpid/store/StorageProvider.h
similarity index 100%
rename from cpp/src/qpid/store/StorageProvider.h
rename to qpid/cpp/src/qpid/store/StorageProvider.h
diff --git a/cpp/src/qpid/store/StoreException.h b/qpid/cpp/src/qpid/store/StoreException.h
similarity index 100%
rename from cpp/src/qpid/store/StoreException.h
rename to qpid/cpp/src/qpid/store/StoreException.h
diff --git a/cpp/src/qpid/store/ms-clfs/Log.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/Log.cpp
rename to qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Log.h b/qpid/cpp/src/qpid/store/ms-clfs/Log.h
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/Log.h
rename to qpid/cpp/src/qpid/store/ms-clfs/Log.h
diff --git a/cpp/src/qpid/store/ms-clfs/Lsn.h b/qpid/cpp/src/qpid/store/ms-clfs/Lsn.h
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/Lsn.h
rename to qpid/cpp/src/qpid/store/ms-clfs/Lsn.h
diff --git a/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
rename to qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/MessageLog.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/MessageLog.cpp
rename to qpid/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/MessageLog.h b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.h
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/MessageLog.h
rename to qpid/cpp/src/qpid/store/ms-clfs/MessageLog.h
diff --git a/cpp/src/qpid/store/ms-clfs/Messages.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/Messages.cpp
rename to qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Messages.h b/qpid/cpp/src/qpid/store/ms-clfs/Messages.h
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/Messages.h
rename to qpid/cpp/src/qpid/store/ms-clfs/Messages.h
diff --git a/cpp/src/qpid/store/ms-clfs/Transaction.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/Transaction.cpp
rename to qpid/cpp/src/qpid/store/ms-clfs/Transaction.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Transaction.h b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/Transaction.h
rename to qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
diff --git a/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
rename to qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/TransactionLog.h b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.h
similarity index 100%
rename from cpp/src/qpid/store/ms-clfs/TransactionLog.h
rename to qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.h
diff --git a/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
diff --git a/cpp/src/qpid/store/ms-sql/AmqpTransaction.h b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/AmqpTransaction.h
rename to qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
diff --git a/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BindingRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BindingRecordset.h
rename to qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobAdapter.h b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BlobAdapter.h
rename to qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobEncoder.h b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BlobEncoder.h
rename to qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/BlobRecordset.h
rename to qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
diff --git a/cpp/src/qpid/store/ms-sql/DatabaseConnection.h b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/DatabaseConnection.h
rename to qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
diff --git a/cpp/src/qpid/store/ms-sql/Exception.h b/qpid/cpp/src/qpid/store/ms-sql/Exception.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/Exception.h
rename to qpid/cpp/src/qpid/store/ms-sql/Exception.h
diff --git a/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
rename to qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/MessageRecordset.h
rename to qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/Recordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/Recordset.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/Recordset.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/Recordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/Recordset.h b/qpid/cpp/src/qpid/store/ms-sql/Recordset.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/Recordset.h
rename to qpid/cpp/src/qpid/store/ms-sql/Recordset.h
diff --git a/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
diff --git a/cpp/src/qpid/store/ms-sql/SqlTransaction.h b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/SqlTransaction.h
rename to qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.h
diff --git a/cpp/src/qpid/store/ms-sql/State.cpp b/qpid/cpp/src/qpid/store/ms-sql/State.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/State.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/State.cpp
diff --git a/cpp/src/qpid/store/ms-sql/State.h b/qpid/cpp/src/qpid/store/ms-sql/State.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/State.h
rename to qpid/cpp/src/qpid/store/ms-sql/State.h
diff --git a/cpp/src/qpid/store/ms-sql/TplRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/TplRecordset.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/TplRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/TplRecordset.h
rename to qpid/cpp/src/qpid/store/ms-sql/TplRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/VariantHelper.cpp b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/VariantHelper.cpp
rename to qpid/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
diff --git a/cpp/src/qpid/store/ms-sql/VariantHelper.h b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.h
similarity index 100%
rename from cpp/src/qpid/store/ms-sql/VariantHelper.h
rename to qpid/cpp/src/qpid/store/ms-sql/VariantHelper.h
diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
similarity index 100%
rename from cpp/src/qpid/sys/AggregateOutput.cpp
rename to qpid/cpp/src/qpid/sys/AggregateOutput.cpp
diff --git a/cpp/src/qpid/sys/AggregateOutput.h b/qpid/cpp/src/qpid/sys/AggregateOutput.h
similarity index 100%
rename from cpp/src/qpid/sys/AggregateOutput.h
rename to qpid/cpp/src/qpid/sys/AggregateOutput.h
diff --git a/cpp/src/qpid/sys/AsynchIO.h b/qpid/cpp/src/qpid/sys/AsynchIO.h
similarity index 97%
rename from cpp/src/qpid/sys/AsynchIO.h
rename to qpid/cpp/src/qpid/sys/AsynchIO.h
index 50da8fa..41f74f7 100644
--- a/cpp/src/qpid/sys/AsynchIO.h
+++ b/qpid/cpp/src/qpid/sys/AsynchIO.h
@@ -64,8 +64,8 @@
     // deletes. To correctly manage heaps when needed, the allocate and
     // delete should both be done from the same class/library.
     QPID_COMMON_EXTERN static AsynchConnector* create(const Socket& s,
-                                   std::string hostname,
-                                   uint16_t port,
+                                   const std::string& hostname,
+                                   const std::string& port,
                                    ConnectedCallback connCb,
                                    FailedCallback failCb);
     virtual void start(boost::shared_ptr<Poller> poller) = 0;
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.cpp b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
similarity index 100%
rename from cpp/src/qpid/sys/AsynchIOHandler.cpp
rename to qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.h b/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
similarity index 100%
rename from cpp/src/qpid/sys/AsynchIOHandler.h
rename to qpid/cpp/src/qpid/sys/AsynchIOHandler.h
diff --git a/cpp/src/qpid/sys/AtomicCount.h b/qpid/cpp/src/qpid/sys/AtomicCount.h
similarity index 100%
rename from cpp/src/qpid/sys/AtomicCount.h
rename to qpid/cpp/src/qpid/sys/AtomicCount.h
diff --git a/cpp/src/qpid/sys/AtomicValue.h b/qpid/cpp/src/qpid/sys/AtomicValue.h
similarity index 100%
rename from cpp/src/qpid/sys/AtomicValue.h
rename to qpid/cpp/src/qpid/sys/AtomicValue.h
diff --git a/cpp/src/qpid/sys/AtomicValue_gcc.h b/qpid/cpp/src/qpid/sys/AtomicValue_gcc.h
similarity index 100%
rename from cpp/src/qpid/sys/AtomicValue_gcc.h
rename to qpid/cpp/src/qpid/sys/AtomicValue_gcc.h
diff --git a/cpp/src/qpid/sys/AtomicValue_mutex.h b/qpid/cpp/src/qpid/sys/AtomicValue_mutex.h
similarity index 100%
rename from cpp/src/qpid/sys/AtomicValue_mutex.h
rename to qpid/cpp/src/qpid/sys/AtomicValue_mutex.h
diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/qpid/cpp/src/qpid/sys/BlockingQueue.h
similarity index 100%
rename from cpp/src/qpid/sys/BlockingQueue.h
rename to qpid/cpp/src/qpid/sys/BlockingQueue.h
diff --git a/cpp/src/qpid/sys/ClusterSafe.cpp b/qpid/cpp/src/qpid/sys/ClusterSafe.cpp
similarity index 100%
rename from cpp/src/qpid/sys/ClusterSafe.cpp
rename to qpid/cpp/src/qpid/sys/ClusterSafe.cpp
diff --git a/cpp/src/qpid/sys/ClusterSafe.h b/qpid/cpp/src/qpid/sys/ClusterSafe.h
similarity index 100%
rename from cpp/src/qpid/sys/ClusterSafe.h
rename to qpid/cpp/src/qpid/sys/ClusterSafe.h
diff --git a/cpp/src/qpid/sys/Codec.h b/qpid/cpp/src/qpid/sys/Codec.h
similarity index 100%
rename from cpp/src/qpid/sys/Codec.h
rename to qpid/cpp/src/qpid/sys/Codec.h
diff --git a/cpp/src/qpid/sys/ConnectionCodec.h b/qpid/cpp/src/qpid/sys/ConnectionCodec.h
similarity index 100%
rename from cpp/src/qpid/sys/ConnectionCodec.h
rename to qpid/cpp/src/qpid/sys/ConnectionCodec.h
diff --git a/cpp/src/qpid/sys/ConnectionInputHandler.h b/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
similarity index 100%
rename from cpp/src/qpid/sys/ConnectionInputHandler.h
rename to qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
diff --git a/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h b/qpid/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
similarity index 100%
rename from cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
rename to qpid/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandler.h b/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
similarity index 100%
rename from cpp/src/qpid/sys/ConnectionOutputHandler.h
rename to qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
similarity index 100%
rename from cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
rename to qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
diff --git a/cpp/src/qpid/sys/CopyOnWriteArray.h b/qpid/cpp/src/qpid/sys/CopyOnWriteArray.h
similarity index 100%
rename from cpp/src/qpid/sys/CopyOnWriteArray.h
rename to qpid/cpp/src/qpid/sys/CopyOnWriteArray.h
diff --git a/cpp/src/qpid/sys/DeletionManager.h b/qpid/cpp/src/qpid/sys/DeletionManager.h
similarity index 100%
rename from cpp/src/qpid/sys/DeletionManager.h
rename to qpid/cpp/src/qpid/sys/DeletionManager.h
diff --git a/cpp/src/qpid/sys/DispatchHandle.cpp b/qpid/cpp/src/qpid/sys/DispatchHandle.cpp
similarity index 100%
rename from cpp/src/qpid/sys/DispatchHandle.cpp
rename to qpid/cpp/src/qpid/sys/DispatchHandle.cpp
diff --git a/cpp/src/qpid/sys/DispatchHandle.h b/qpid/cpp/src/qpid/sys/DispatchHandle.h
similarity index 100%
rename from cpp/src/qpid/sys/DispatchHandle.h
rename to qpid/cpp/src/qpid/sys/DispatchHandle.h
diff --git a/cpp/src/qpid/sys/Dispatcher.cpp b/qpid/cpp/src/qpid/sys/Dispatcher.cpp
similarity index 100%
rename from cpp/src/qpid/sys/Dispatcher.cpp
rename to qpid/cpp/src/qpid/sys/Dispatcher.cpp
diff --git a/cpp/src/qpid/sys/Dispatcher.h b/qpid/cpp/src/qpid/sys/Dispatcher.h
similarity index 100%
rename from cpp/src/qpid/sys/Dispatcher.h
rename to qpid/cpp/src/qpid/sys/Dispatcher.h
diff --git a/cpp/src/qpid/sys/FileSysDir.h b/qpid/cpp/src/qpid/sys/FileSysDir.h
similarity index 100%
rename from cpp/src/qpid/sys/FileSysDir.h
rename to qpid/cpp/src/qpid/sys/FileSysDir.h
diff --git a/cpp/src/qpid/sys/Fork.h b/qpid/cpp/src/qpid/sys/Fork.h
similarity index 100%
rename from cpp/src/qpid/sys/Fork.h
rename to qpid/cpp/src/qpid/sys/Fork.h
diff --git a/cpp/src/qpid/sys/LockFile.h b/qpid/cpp/src/qpid/sys/LockFile.h
similarity index 100%
rename from cpp/src/qpid/sys/LockFile.h
rename to qpid/cpp/src/qpid/sys/LockFile.h
diff --git a/cpp/src/qpid/sys/LockPtr.h b/qpid/cpp/src/qpid/sys/LockPtr.h
similarity index 100%
rename from cpp/src/qpid/sys/LockPtr.h
rename to qpid/cpp/src/qpid/sys/LockPtr.h
diff --git a/cpp/src/qpid/sys/OutputControl.h b/qpid/cpp/src/qpid/sys/OutputControl.h
similarity index 100%
rename from cpp/src/qpid/sys/OutputControl.h
rename to qpid/cpp/src/qpid/sys/OutputControl.h
diff --git a/cpp/src/qpid/sys/OutputTask.h b/qpid/cpp/src/qpid/sys/OutputTask.h
similarity index 100%
rename from cpp/src/qpid/sys/OutputTask.h
rename to qpid/cpp/src/qpid/sys/OutputTask.h
diff --git a/cpp/src/qpid/sys/PipeHandle.h b/qpid/cpp/src/qpid/sys/PipeHandle.h
similarity index 100%
rename from cpp/src/qpid/sys/PipeHandle.h
rename to qpid/cpp/src/qpid/sys/PipeHandle.h
diff --git a/cpp/src/qpid/sys/PollableCondition.h b/qpid/cpp/src/qpid/sys/PollableCondition.h
similarity index 100%
rename from cpp/src/qpid/sys/PollableCondition.h
rename to qpid/cpp/src/qpid/sys/PollableCondition.h
diff --git a/cpp/src/qpid/sys/PollableQueue.h b/qpid/cpp/src/qpid/sys/PollableQueue.h
similarity index 100%
rename from cpp/src/qpid/sys/PollableQueue.h
rename to qpid/cpp/src/qpid/sys/PollableQueue.h
diff --git a/cpp/src/qpid/sys/Poller.h b/qpid/cpp/src/qpid/sys/Poller.h
similarity index 100%
rename from cpp/src/qpid/sys/Poller.h
rename to qpid/cpp/src/qpid/sys/Poller.h
diff --git a/cpp/src/qpid/sys/ProtocolFactory.h b/qpid/cpp/src/qpid/sys/ProtocolFactory.h
similarity index 94%
rename from cpp/src/qpid/sys/ProtocolFactory.h
rename to qpid/cpp/src/qpid/sys/ProtocolFactory.h
index b233b2d..4d198a9 100644
--- a/cpp/src/qpid/sys/ProtocolFactory.h
+++ b/qpid/cpp/src/qpid/sys/ProtocolFactory.h
@@ -39,11 +39,10 @@
 
     virtual ~ProtocolFactory() = 0;
     virtual uint16_t getPort() const = 0;
-    virtual std::string getHost() const = 0;
     virtual void accept(boost::shared_ptr<Poller>, ConnectionCodec::Factory*) = 0;
     virtual void connect(
         boost::shared_ptr<Poller>,
-        const std::string& host, int16_t port,
+        const std::string& host, const std::string& port,
         ConnectionCodec::Factory* codec,
         ConnectFailedCallback failed) = 0;
     virtual bool supports(const std::string& /*capability*/) { return false; }
diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
similarity index 96%
rename from cpp/src/qpid/sys/RdmaIOPlugin.cpp
rename to qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index d53db20..631d116 100644
--- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
@@ -31,7 +31,6 @@
 #include "qpid/sys/SecuritySettings.h"
 
 #include <boost/bind.hpp>
-#include <boost/lexical_cast.hpp>
 #include <memory>
 
 #include <netdb.h>
@@ -254,10 +253,9 @@
   public:
     RdmaIOProtocolFactory(int16_t port, int backlog);
     void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
-    void connect(Poller::shared_ptr, const string& host, int16_t port, ConnectionCodec::Factory*, ConnectFailedCallback);
+    void connect(Poller::shared_ptr, const string& host, const std::string& port, ConnectionCodec::Factory*, ConnectFailedCallback);
 
     uint16_t getPort() const;
-    string getHost() const;
 
   private:
     bool request(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectionCodec::Factory*);
@@ -347,11 +345,6 @@
     return listeningPort; // Immutable no need for lock.
 }
 
-string RdmaIOProtocolFactory::getHost() const {
-    //return listener.getSockname();
-    return "";
-}
-
 void RdmaIOProtocolFactory::accept(Poller::shared_ptr poller, ConnectionCodec::Factory* fact) {
     ::sockaddr_in sin;
 
@@ -387,7 +380,7 @@
 
 void RdmaIOProtocolFactory::connect(
     Poller::shared_ptr poller,
-    const std::string& host, int16_t port,
+    const std::string& host, const std::string& port,
     ConnectionCodec::Factory* f,
     ConnectFailedCallback failed)
 {
@@ -399,7 +392,7 @@
             boost::bind(&RdmaIOProtocolFactory::disconnected, this, _1),
             boost::bind(&RdmaIOProtocolFactory::rejected, this, _1, _2, failed));
 
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
+    SocketAddress sa(host, port);
     c->start(poller, sa);
 }
 
diff --git a/cpp/src/qpid/sys/Runnable.cpp b/qpid/cpp/src/qpid/sys/Runnable.cpp
similarity index 100%
rename from cpp/src/qpid/sys/Runnable.cpp
rename to qpid/cpp/src/qpid/sys/Runnable.cpp
diff --git a/cpp/src/qpid/sys/ScopedIncrement.h b/qpid/cpp/src/qpid/sys/ScopedIncrement.h
similarity index 100%
rename from cpp/src/qpid/sys/ScopedIncrement.h
rename to qpid/cpp/src/qpid/sys/ScopedIncrement.h
diff --git a/cpp/src/qpid/sys/SecurityLayer.h b/qpid/cpp/src/qpid/sys/SecurityLayer.h
similarity index 100%
rename from cpp/src/qpid/sys/SecurityLayer.h
rename to qpid/cpp/src/qpid/sys/SecurityLayer.h
diff --git a/cpp/src/qpid/sys/SecuritySettings.h b/qpid/cpp/src/qpid/sys/SecuritySettings.h
similarity index 100%
rename from cpp/src/qpid/sys/SecuritySettings.h
rename to qpid/cpp/src/qpid/sys/SecuritySettings.h
diff --git a/cpp/src/qpid/sys/Semaphore.h b/qpid/cpp/src/qpid/sys/Semaphore.h
similarity index 100%
rename from cpp/src/qpid/sys/Semaphore.h
rename to qpid/cpp/src/qpid/sys/Semaphore.h
diff --git a/cpp/src/qpid/sys/Shlib.cpp b/qpid/cpp/src/qpid/sys/Shlib.cpp
similarity index 100%
rename from cpp/src/qpid/sys/Shlib.cpp
rename to qpid/cpp/src/qpid/sys/Shlib.cpp
diff --git a/cpp/src/qpid/sys/Shlib.h b/qpid/cpp/src/qpid/sys/Shlib.h
similarity index 100%
rename from cpp/src/qpid/sys/Shlib.h
rename to qpid/cpp/src/qpid/sys/Shlib.h
diff --git a/cpp/src/qpid/sys/ShutdownHandler.h b/qpid/cpp/src/qpid/sys/ShutdownHandler.h
similarity index 100%
rename from cpp/src/qpid/sys/ShutdownHandler.h
rename to qpid/cpp/src/qpid/sys/ShutdownHandler.h
diff --git a/cpp/src/qpid/sys/Socket.h b/qpid/cpp/src/qpid/sys/Socket.h
similarity index 81%
rename from cpp/src/qpid/sys/Socket.h
rename to qpid/cpp/src/qpid/sys/Socket.h
index b1cded1..9f62f3b 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/qpid/cpp/src/qpid/sys/Socket.h
@@ -39,15 +39,12 @@
     /** Create a socket wrapper for descriptor. */
     QPID_COMMON_EXTERN Socket();
 
-    /** Set timeout for read and write */
-    void setTimeout(const Duration& interval) const;
-
     /** Set socket non blocking */
     void setNonblocking() const;
 
     QPID_COMMON_EXTERN void setTcpNoDelay() const;
 
-    QPID_COMMON_EXTERN void connect(const std::string& host, uint16_t port) const;
+    QPID_COMMON_EXTERN void connect(const std::string& host, const std::string& port) const;
     QPID_COMMON_EXTERN void connect(const SocketAddress&) const;
 
     QPID_COMMON_EXTERN void close() const;
@@ -57,19 +54,9 @@
      *@param backlog maximum number of pending connections.
      *@return The bound port.
      */
-    QPID_COMMON_EXTERN int listen(uint16_t port = 0, int backlog = 10) const;
+    QPID_COMMON_EXTERN int listen(const std::string& host = "", const std::string& port = "0", int backlog = 10) const;
     QPID_COMMON_EXTERN int listen(const SocketAddress&, int backlog = 10) const;
 
-    /** Returns the "socket name" ie the address bound to
-     * the near end of the socket
-     */
-    QPID_COMMON_EXTERN std::string getSockname() const;
-
-    /** Returns the "peer name" ie the address bound to
-     * the remote end of the socket
-     */
-    std::string getPeername() const;
-
     /**
      * Returns an address (host and port) for the remote end of the
      * socket
@@ -86,9 +73,6 @@
      */
     QPID_COMMON_INLINE_EXTERN std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
 
-    QPID_COMMON_EXTERN uint16_t getLocalPort() const;
-    uint16_t getRemotePort() const;
-
     /**
      * Returns the error code stored in the socket.  This may be used
      * to determine the result of a non-blocking connect.
@@ -109,7 +93,8 @@
     void createSocket(const SocketAddress&) const;
 
     Socket(IOHandlePrivate*);
-    mutable std::string connectname;
+    mutable std::string localname;
+    mutable std::string peername;
     mutable bool nonblocking;
     mutable bool nodelay;
 };
diff --git a/cpp/src/qpid/sys/SocketAddress.h b/qpid/cpp/src/qpid/sys/SocketAddress.h
similarity index 96%
rename from cpp/src/qpid/sys/SocketAddress.h
rename to qpid/cpp/src/qpid/sys/SocketAddress.h
index 27b9642..c212033 100644
--- a/cpp/src/qpid/sys/SocketAddress.h
+++ b/qpid/cpp/src/qpid/sys/SocketAddress.h
@@ -41,7 +41,7 @@
     QPID_COMMON_EXTERN SocketAddress& operator=(const SocketAddress&);
     QPID_COMMON_EXTERN ~SocketAddress();
 
-    std::string asString() const;
+    std::string asString(bool numeric=true) const;
 
 private:
     std::string host;
diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
similarity index 96%
rename from cpp/src/qpid/sys/SslPlugin.cpp
rename to qpid/cpp/src/qpid/sys/SslPlugin.cpp
index 0ec051c..471a0ce 100644
--- a/cpp/src/qpid/sys/SslPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
@@ -66,12 +66,11 @@
   public:
     SslProtocolFactory(const SslServerOptions&, int backlog, bool nodelay);
     void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
-    void connect(Poller::shared_ptr, const std::string& host, int16_t port,
+    void connect(Poller::shared_ptr, const std::string& host, const std::string& port,
                  ConnectionCodec::Factory*,
                  boost::function2<void, int, std::string> failed);
 
     uint16_t getPort() const;
-    std::string getHost() const;
     bool supports(const std::string& capability);
 
   private:
@@ -146,10 +145,6 @@
     return listeningPort; // Immutable no need for lock.
 }
 
-std::string SslProtocolFactory::getHost() const {
-    return listener.getSockname();
-}
-
 void SslProtocolFactory::accept(Poller::shared_ptr poller,
                                      ConnectionCodec::Factory* fact) {
     acceptor.reset(
@@ -160,7 +155,7 @@
 
 void SslProtocolFactory::connect(
     Poller::shared_ptr poller,
-    const std::string& host, int16_t port,
+    const std::string& host, const std::string& port,
     ConnectionCodec::Factory* fact,
     ConnectFailedCallback failed)
 {
diff --git a/cpp/src/qpid/sys/StateMonitor.h b/qpid/cpp/src/qpid/sys/StateMonitor.h
similarity index 100%
rename from cpp/src/qpid/sys/StateMonitor.h
rename to qpid/cpp/src/qpid/sys/StateMonitor.h
diff --git a/cpp/src/qpid/sys/TCPIOPlugin.cpp b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
similarity index 85%
rename from cpp/src/qpid/sys/TCPIOPlugin.cpp
rename to qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
index a6528f9..34338ce 100644
--- a/cpp/src/qpid/sys/TCPIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
@@ -42,14 +42,13 @@
     std::auto_ptr<AsynchAcceptor> acceptor;
 
   public:
-    AsynchIOProtocolFactory(int16_t port, int backlog, bool nodelay);
+    AsynchIOProtocolFactory(const std::string& host, const std::string& port, int backlog, bool nodelay);
     void accept(Poller::shared_ptr, ConnectionCodec::Factory*);
-    void connect(Poller::shared_ptr, const std::string& host, int16_t port,
+    void connect(Poller::shared_ptr, const std::string& host, const std::string& port,
                  ConnectionCodec::Factory*,
                  ConnectFailedCallback);
 
     uint16_t getPort() const;
-    std::string getHost() const;
 
   private:
     void established(Poller::shared_ptr, const Socket&, ConnectionCodec::Factory*,
@@ -61,22 +60,25 @@
 static class TCPIOPlugin : public Plugin {
     void earlyInitialize(Target&) {
     }
-    
+
     void initialize(Target& target) {
         broker::Broker* broker = dynamic_cast<broker::Broker*>(&target);
         // Only provide to a Broker
         if (broker) {
             const broker::Broker::Options& opts = broker->getOptions();
-            ProtocolFactory::shared_ptr protocol(new AsynchIOProtocolFactory(opts.port, opts.connectionBacklog, 
-                                                                             opts.tcpNoDelay));
-            QPID_LOG(notice, "Listening on TCP port " << protocol->getPort());
-            broker->registerProtocolFactory("tcp", protocol);
+            ProtocolFactory::shared_ptr protocolt(
+                new AsynchIOProtocolFactory(
+                    "", boost::lexical_cast<std::string>(opts.port),
+                    opts.connectionBacklog,
+                    opts.tcpNoDelay));
+            QPID_LOG(notice, "Listening on TCP port " << protocolt->getPort());
+            broker->registerProtocolFactory("tcp", protocolt);
         }
     }
 } tcpPlugin;
 
-AsynchIOProtocolFactory::AsynchIOProtocolFactory(int16_t port, int backlog, bool nodelay) :
-    tcpNoDelay(nodelay), listeningPort(listener.listen(port, backlog))
+AsynchIOProtocolFactory::AsynchIOProtocolFactory(const std::string& host, const std::string& port, int backlog, bool nodelay) :
+    tcpNoDelay(nodelay), listeningPort(listener.listen(host, port, backlog))
 {}
 
 void AsynchIOProtocolFactory::established(Poller::shared_ptr poller, const Socket& s,
@@ -107,10 +109,6 @@
     return listeningPort; // Immutable no need for lock.
 }
 
-std::string AsynchIOProtocolFactory::getHost() const {
-    return listener.getSockname();
-}
-
 void AsynchIOProtocolFactory::accept(Poller::shared_ptr poller,
                                      ConnectionCodec::Factory* fact) {
     acceptor.reset(
@@ -130,7 +128,7 @@
 
 void AsynchIOProtocolFactory::connect(
     Poller::shared_ptr poller,
-    const std::string& host, int16_t port,
+    const std::string& host, const std::string& port,
     ConnectionCodec::Factory* fact,
     ConnectFailedCallback failed)
 {
@@ -139,7 +137,6 @@
     // upon connection failure or by the AsynchIO upon connection
     // shutdown.  The allocated AsynchConnector frees itself when it
     // is no longer needed.
-
     Socket* socket = new Socket();
     AsynchConnector* c = AsynchConnector::create(
         *socket,
diff --git a/cpp/src/qpid/sys/TimeoutHandler.h b/qpid/cpp/src/qpid/sys/TimeoutHandler.h
similarity index 100%
rename from cpp/src/qpid/sys/TimeoutHandler.h
rename to qpid/cpp/src/qpid/sys/TimeoutHandler.h
diff --git a/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp
similarity index 100%
rename from cpp/src/qpid/sys/Timer.cpp
rename to qpid/cpp/src/qpid/sys/Timer.cpp
diff --git a/cpp/src/qpid/sys/Timer.h b/qpid/cpp/src/qpid/sys/Timer.h
similarity index 100%
rename from cpp/src/qpid/sys/Timer.h
rename to qpid/cpp/src/qpid/sys/Timer.h
diff --git a/cpp/src/qpid/sys/TimerWarnings.cpp b/qpid/cpp/src/qpid/sys/TimerWarnings.cpp
similarity index 100%
rename from cpp/src/qpid/sys/TimerWarnings.cpp
rename to qpid/cpp/src/qpid/sys/TimerWarnings.cpp
diff --git a/cpp/src/qpid/sys/TimerWarnings.h b/qpid/cpp/src/qpid/sys/TimerWarnings.h
similarity index 100%
rename from cpp/src/qpid/sys/TimerWarnings.h
rename to qpid/cpp/src/qpid/sys/TimerWarnings.h
diff --git a/cpp/src/qpid/sys/Waitable.h b/qpid/cpp/src/qpid/sys/Waitable.h
similarity index 100%
rename from cpp/src/qpid/sys/Waitable.h
rename to qpid/cpp/src/qpid/sys/Waitable.h
diff --git a/cpp/src/qpid/sys/alloca.h b/qpid/cpp/src/qpid/sys/alloca.h
similarity index 100%
rename from cpp/src/qpid/sys/alloca.h
rename to qpid/cpp/src/qpid/sys/alloca.h
diff --git a/cpp/src/qpid/sys/apr/APRBase.cpp b/qpid/cpp/src/qpid/sys/apr/APRBase.cpp
similarity index 100%
rename from cpp/src/qpid/sys/apr/APRBase.cpp
rename to qpid/cpp/src/qpid/sys/apr/APRBase.cpp
diff --git a/cpp/src/qpid/sys/apr/APRBase.h b/qpid/cpp/src/qpid/sys/apr/APRBase.h
similarity index 100%
rename from cpp/src/qpid/sys/apr/APRBase.h
rename to qpid/cpp/src/qpid/sys/apr/APRBase.h
diff --git a/cpp/src/qpid/sys/apr/APRPool.cpp b/qpid/cpp/src/qpid/sys/apr/APRPool.cpp
similarity index 100%
rename from cpp/src/qpid/sys/apr/APRPool.cpp
rename to qpid/cpp/src/qpid/sys/apr/APRPool.cpp
diff --git a/cpp/src/qpid/sys/apr/APRPool.h b/qpid/cpp/src/qpid/sys/apr/APRPool.h
similarity index 100%
rename from cpp/src/qpid/sys/apr/APRPool.h
rename to qpid/cpp/src/qpid/sys/apr/APRPool.h
diff --git a/cpp/src/qpid/sys/apr/Condition.h b/qpid/cpp/src/qpid/sys/apr/Condition.h
similarity index 100%
rename from cpp/src/qpid/sys/apr/Condition.h
rename to qpid/cpp/src/qpid/sys/apr/Condition.h
diff --git a/cpp/src/qpid/sys/apr/Mutex.h b/qpid/cpp/src/qpid/sys/apr/Mutex.h
similarity index 100%
rename from cpp/src/qpid/sys/apr/Mutex.h
rename to qpid/cpp/src/qpid/sys/apr/Mutex.h
diff --git a/cpp/src/qpid/sys/apr/Shlib.cpp b/qpid/cpp/src/qpid/sys/apr/Shlib.cpp
similarity index 100%
rename from cpp/src/qpid/sys/apr/Shlib.cpp
rename to qpid/cpp/src/qpid/sys/apr/Shlib.cpp
diff --git a/cpp/src/qpid/sys/apr/Socket.cpp b/qpid/cpp/src/qpid/sys/apr/Socket.cpp
similarity index 100%
rename from cpp/src/qpid/sys/apr/Socket.cpp
rename to qpid/cpp/src/qpid/sys/apr/Socket.cpp
diff --git a/cpp/src/qpid/sys/apr/Thread.cpp b/qpid/cpp/src/qpid/sys/apr/Thread.cpp
similarity index 100%
rename from cpp/src/qpid/sys/apr/Thread.cpp
rename to qpid/cpp/src/qpid/sys/apr/Thread.cpp
diff --git a/cpp/src/qpid/sys/apr/Thread.h b/qpid/cpp/src/qpid/sys/apr/Thread.h
similarity index 100%
rename from cpp/src/qpid/sys/apr/Thread.h
rename to qpid/cpp/src/qpid/sys/apr/Thread.h
diff --git a/cpp/src/qpid/sys/apr/Time.cpp b/qpid/cpp/src/qpid/sys/apr/Time.cpp
similarity index 100%
rename from cpp/src/qpid/sys/apr/Time.cpp
rename to qpid/cpp/src/qpid/sys/apr/Time.cpp
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
similarity index 100%
rename from cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
rename to qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
similarity index 100%
rename from cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
rename to qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
diff --git a/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
similarity index 100%
rename from cpp/src/qpid/sys/epoll/EpollPoller.cpp
rename to qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
similarity index 97%
rename from cpp/src/qpid/sys/posix/AsynchIO.cpp
rename to qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
index 119a6aa..b5a0b0b 100644
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
@@ -152,8 +152,8 @@
 
 public:
     AsynchConnector(const Socket& socket,
-                    std::string hostname,
-                    uint16_t port,
+                    const std::string& hostname,
+                    const std::string& port,
                     ConnectedCallback connCb,
                     FailedCallback failCb);
     void start(Poller::shared_ptr poller);
@@ -161,8 +161,8 @@
 };
 
 AsynchConnector::AsynchConnector(const Socket& s,
-                                 std::string hostname,
-                                 uint16_t port,
+                                 const std::string& hostname,
+                                 const std::string& port,
                                  ConnectedCallback connCb,
                                  FailedCallback failCb) :
     DispatchHandle(s,
@@ -174,7 +174,7 @@
     socket(s)
 {
     socket.setNonblocking();
-    SocketAddress sa(hostname, boost::lexical_cast<std::string>(port));
+    SocketAddress sa(hostname, port);
     // Note, not catching any exceptions here, also has effect of destructing
     socket.connect(sa);
 }
@@ -589,8 +589,8 @@
 }
 
 AsynchConnector* AsynchConnector::create(const Socket& s,
-                                         std::string hostname,
-                                         uint16_t port,
+                                         const std::string& hostname,
+                                         const std::string& port,
                                          ConnectedCallback connCb,
                                          FailedCallback failCb)
 {
diff --git a/cpp/src/qpid/sys/posix/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/posix/FileSysDir.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/FileSysDir.cpp
rename to qpid/cpp/src/qpid/sys/posix/FileSysDir.cpp
diff --git a/cpp/src/qpid/sys/posix/Fork.cpp b/qpid/cpp/src/qpid/sys/posix/Fork.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/Fork.cpp
rename to qpid/cpp/src/qpid/sys/posix/Fork.cpp
diff --git a/cpp/src/qpid/sys/posix/Fork.h b/qpid/cpp/src/qpid/sys/posix/Fork.h
similarity index 100%
rename from cpp/src/qpid/sys/posix/Fork.h
rename to qpid/cpp/src/qpid/sys/posix/Fork.h
diff --git a/cpp/src/qpid/sys/posix/IOHandle.cpp b/qpid/cpp/src/qpid/sys/posix/IOHandle.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/IOHandle.cpp
rename to qpid/cpp/src/qpid/sys/posix/IOHandle.cpp
diff --git a/cpp/src/qpid/sys/posix/LockFile.cpp b/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/LockFile.cpp
rename to qpid/cpp/src/qpid/sys/posix/LockFile.cpp
diff --git a/cpp/src/qpid/sys/posix/Mutex.cpp b/qpid/cpp/src/qpid/sys/posix/Mutex.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/Mutex.cpp
rename to qpid/cpp/src/qpid/sys/posix/Mutex.cpp
diff --git a/cpp/src/qpid/sys/posix/PidFile.h b/qpid/cpp/src/qpid/sys/posix/PidFile.h
similarity index 100%
rename from cpp/src/qpid/sys/posix/PidFile.h
rename to qpid/cpp/src/qpid/sys/posix/PidFile.h
diff --git a/cpp/src/qpid/sys/posix/PipeHandle.cpp b/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/PipeHandle.cpp
rename to qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp
diff --git a/cpp/src/qpid/sys/posix/PollableCondition.cpp b/qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/PollableCondition.cpp
rename to qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
diff --git a/cpp/src/qpid/sys/posix/Shlib.cpp b/qpid/cpp/src/qpid/sys/posix/Shlib.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/Shlib.cpp
rename to qpid/cpp/src/qpid/sys/posix/Shlib.cpp
diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/qpid/cpp/src/qpid/sys/posix/Socket.cpp
similarity index 67%
rename from cpp/src/qpid/sys/posix/Socket.cpp
rename to qpid/cpp/src/qpid/sys/posix/Socket.cpp
index 3449a75..aa25f80 100644
--- a/cpp/src/qpid/sys/posix/Socket.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Socket.cpp
@@ -37,13 +37,12 @@
 #include <iostream>
 
 #include <boost/format.hpp>
-#include <boost/lexical_cast.hpp>
 
 namespace qpid {
 namespace sys {
 
 namespace {
-std::string getName(int fd, bool local, bool includeService = false)
+std::string getName(int fd, bool local)
 {
     ::sockaddr_storage name; // big enough for any socket address
     ::socklen_t namelen = sizeof(name);
@@ -54,45 +53,15 @@
     } else {
         result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
     }
-
     QPID_POSIX_CHECK(result);
 
     char servName[NI_MAXSERV];
     char dispName[NI_MAXHOST];
-    if (includeService) {
-        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName),
-                                 servName, sizeof(servName),
-                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-            throw QPID_POSIX_ERROR(rc);
-        return std::string(dispName) + ":" + std::string(servName);
-
-    } else {
-        if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName), 0, 0, NI_NUMERICHOST) != 0)
-            throw QPID_POSIX_ERROR(rc);
-        return dispName;
-    }
-}
-
-std::string getService(int fd, bool local)
-{
-    ::sockaddr_storage name; // big enough for any socket address
-    ::socklen_t namelen = sizeof(name);
-
-    int result = -1;
-    if (local) {
-        result = ::getsockname(fd, (::sockaddr*)&name, &namelen);
-    } else {
-        result = ::getpeername(fd, (::sockaddr*)&name, &namelen);
-    }
-
-    QPID_POSIX_CHECK(result);
-
-    char servName[NI_MAXSERV];
-    if (int rc=::getnameinfo((::sockaddr*)&name, namelen, 0, 0,
-                                 servName, sizeof(servName),
-                                 NI_NUMERICHOST | NI_NUMERICSERV) != 0)
+    if (int rc=::getnameinfo((::sockaddr*)&name, namelen, dispName, sizeof(dispName),
+                                servName, sizeof(servName),
+                                NI_NUMERICHOST | NI_NUMERICSERV) != 0)
         throw QPID_POSIX_ERROR(rc);
-    return servName;
+    return std::string(dispName) + ":" + std::string(servName);
 }
 }
 
@@ -126,15 +95,6 @@
     }
 }
 
-void Socket::setTimeout(const Duration& interval) const
-{
-    const int& socket = impl->fd;
-    struct timeval tv;
-    toTimeval(tv, interval);
-    setsockopt(socket, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
-    setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-}
-
 void Socket::setNonblocking() const {
     int& socket = impl->fd;
     nonblocking = true;
@@ -154,15 +114,22 @@
     }
 }
 
-void Socket::connect(const std::string& host, uint16_t port) const
+void Socket::connect(const std::string& host, const std::string& port) const
 {
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
+    SocketAddress sa(host, port);
     connect(sa);
 }
 
 void Socket::connect(const SocketAddress& addr) const
 {
-    connectname = addr.asString();
+    // The display name for an outbound connection needs to be the name that was specified
+    // for the address rather than a resolved IP address as we don't know which of
+    // the IP addresses is actually the one that will be connected to.
+    peername = addr.asString(false);
+
+    // However the string we compare with the local port must be numeric or it might not
+    // match when it should as getLocalAddress() will always be numeric
+    std::string connectname = addr.asString();
 
     createSocket(addr);
 
@@ -170,7 +137,7 @@
     // TODO the correct thing to do here is loop on failure until you've used all the returned addresses
     if ((::connect(socket, getAddrInfo(addr).ai_addr, getAddrInfo(addr).ai_addrlen) < 0) &&
         (errno != EINPROGRESS)) {
-        throw Exception(QPID_MSG(strError(errno) << ": " << connectname));
+        throw Exception(QPID_MSG(strError(errno) << ": " << peername));
     }
     // When connecting to a port on the same host which no longer has
     // a process associated with it, the OS occasionally chooses the
@@ -185,9 +152,9 @@
     // Raise an error if we see such a connection, since we know there is
     // no listener on the peer address.
     //
-    if (getLocalAddress() == getPeerAddress()) {
+    if (getLocalAddress() == connectname) {
         close();
-        throw Exception(QPID_MSG("Connection refused: " << connectname));
+        throw Exception(QPID_MSG("Connection refused: " << peername));
     }
 }
 
@@ -200,9 +167,9 @@
     socket = -1;
 }
 
-int Socket::listen(uint16_t port, int backlog) const
+int Socket::listen(const std::string& host, const std::string& port, int backlog) const
 {
-    SocketAddress sa("", boost::lexical_cast<std::string>(port));
+    SocketAddress sa(host, port);
     return listen(sa, backlog);
 }
 
@@ -230,8 +197,11 @@
 Socket* Socket::accept() const
 {
     int afd = ::accept(impl->fd, 0, 0);
-    if ( afd >= 0)
-        return new Socket(new IOHandlePrivate(afd));
+    if ( afd >= 0) {
+        Socket* s = new Socket(new IOHandlePrivate(afd));
+        s->localname = localname;
+        return s;
+    }
     else if (errno == EAGAIN)
         return 0;
     else throw QPID_POSIX_ERROR(errno);
@@ -247,37 +217,20 @@
     return ::write(impl->fd, buf, count);
 }
 
-std::string Socket::getSockname() const
-{
-    return getName(impl->fd, true);
-}
-
-std::string Socket::getPeername() const
-{
-    return getName(impl->fd, false);
-}
-
 std::string Socket::getPeerAddress() const
 {
-    if (connectname.empty()) {
-        connectname = getName(impl->fd, false, true);
+    if (peername.empty()) {
+        peername = getName(impl->fd, false);
     }
-    return connectname;
+    return peername;
 }
 
 std::string Socket::getLocalAddress() const
 {
-    return getName(impl->fd, true, true);
-}
-
-uint16_t Socket::getLocalPort() const
-{
-    return std::atoi(getService(impl->fd, true).c_str());
-}
-
-uint16_t Socket::getRemotePort() const
-{
-    return std::atoi(getService(impl->fd, true).c_str());
+    if (localname.empty()) {
+        localname = getName(impl->fd, true);
+    }
+    return localname;
 }
 
 int Socket::getError() const
diff --git a/cpp/src/qpid/sys/posix/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
similarity index 72%
rename from cpp/src/qpid/sys/posix/SocketAddress.cpp
rename to qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
index 8f5f29d..10f1c8a 100644
--- a/cpp/src/qpid/sys/posix/SocketAddress.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
@@ -27,6 +27,8 @@
 #include <string.h>
 #include <netdb.h>
 
+#include <algorithm>
+
 namespace qpid {
 namespace sys {
 
@@ -46,15 +48,9 @@
 
 SocketAddress& SocketAddress::operator=(const SocketAddress& sa)
 {
-    if (&sa != this) {
-        host = sa.host;
-        port = sa.port;
+    SocketAddress temp(sa);
 
-        if (addrInfo) {
-            ::freeaddrinfo(addrInfo);
-            addrInfo = 0;
-        }
-    }
+    std::swap(temp, *this);
     return *this;
 }
 
@@ -65,9 +61,23 @@
     }
 }
 
-std::string SocketAddress::asString() const
+std::string SocketAddress::asString(bool numeric) const
 {
-    return host + ":" + port;
+    if (!numeric)
+        return host + ":" + port;
+    // Canonicalise into numeric id
+    const ::addrinfo& ai = getAddrInfo(*this);
+    char servName[NI_MAXSERV];
+    char dispName[NI_MAXHOST];
+    if (int rc=::getnameinfo(ai.ai_addr, ai.ai_addrlen,
+                            dispName, sizeof(dispName),
+                            servName, sizeof(servName),
+                            NI_NUMERICHOST | NI_NUMERICSERV) != 0)
+        throw QPID_POSIX_ERROR(rc);
+    std::string s(dispName);
+    s += ":";
+    s += servName;
+    return s;
 }
 
 const ::addrinfo& getAddrInfo(const SocketAddress& sa)
@@ -88,7 +98,7 @@
 
         int n = ::getaddrinfo(node, service, &hints, &sa.addrInfo);
         if (n != 0)
-            throw Exception(QPID_MSG("Cannot resolve " << sa.host << ": " << ::gai_strerror(n)));
+            throw Exception(QPID_MSG("Cannot resolve " << sa.asString(false) << ": " << ::gai_strerror(n)));
     }
 
     return *sa.addrInfo;
diff --git a/cpp/src/qpid/sys/posix/StrError.cpp b/qpid/cpp/src/qpid/sys/posix/StrError.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/StrError.cpp
rename to qpid/cpp/src/qpid/sys/posix/StrError.cpp
diff --git a/cpp/src/qpid/sys/posix/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/SystemInfo.cpp
rename to qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/posix/Thread.cpp b/qpid/cpp/src/qpid/sys/posix/Thread.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/Thread.cpp
rename to qpid/cpp/src/qpid/sys/posix/Thread.cpp
diff --git a/cpp/src/qpid/sys/posix/Time.cpp b/qpid/cpp/src/qpid/sys/posix/Time.cpp
similarity index 100%
rename from cpp/src/qpid/sys/posix/Time.cpp
rename to qpid/cpp/src/qpid/sys/posix/Time.cpp
diff --git a/cpp/src/qpid/sys/rdma/RdmaClient.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
similarity index 100%
rename from cpp/src/qpid/sys/rdma/RdmaClient.cpp
rename to qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
similarity index 100%
rename from cpp/src/qpid/sys/rdma/RdmaIO.cpp
rename to qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.h b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
similarity index 100%
rename from cpp/src/qpid/sys/rdma/RdmaIO.h
rename to qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
diff --git a/cpp/src/qpid/sys/rdma/RdmaServer.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
similarity index 100%
rename from cpp/src/qpid/sys/rdma/RdmaServer.cpp
rename to qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_exception.h b/qpid/cpp/src/qpid/sys/rdma/rdma_exception.h
similarity index 100%
rename from cpp/src/qpid/sys/rdma/rdma_exception.h
rename to qpid/cpp/src/qpid/sys/rdma/rdma_exception.h
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.cpp b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.cpp
similarity index 100%
rename from cpp/src/qpid/sys/rdma/rdma_factories.cpp
rename to qpid/cpp/src/qpid/sys/rdma/rdma_factories.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.h b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h
similarity index 100%
rename from cpp/src/qpid/sys/rdma/rdma_factories.h
rename to qpid/cpp/src/qpid/sys/rdma/rdma_factories.h
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
similarity index 100%
rename from cpp/src/qpid/sys/rdma/rdma_wrap.cpp
rename to qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.h b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
similarity index 100%
rename from cpp/src/qpid/sys/rdma/rdma_wrap.h
rename to qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
diff --git a/cpp/src/qpid/sys/solaris/ECFPoller.cpp b/qpid/cpp/src/qpid/sys/solaris/ECFPoller.cpp
similarity index 100%
rename from cpp/src/qpid/sys/solaris/ECFPoller.cpp
rename to qpid/cpp/src/qpid/sys/solaris/ECFPoller.cpp
diff --git a/cpp/src/qpid/sys/solaris/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
similarity index 100%
rename from cpp/src/qpid/sys/solaris/SystemInfo.cpp
rename to qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/ssl/SslHandler.cpp b/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
similarity index 100%
rename from cpp/src/qpid/sys/ssl/SslHandler.cpp
rename to qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
diff --git a/cpp/src/qpid/sys/ssl/SslHandler.h b/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
similarity index 100%
rename from cpp/src/qpid/sys/ssl/SslHandler.h
rename to qpid/cpp/src/qpid/sys/ssl/SslHandler.h
diff --git a/cpp/src/qpid/sys/ssl/SslIo.cpp b/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
similarity index 99%
rename from cpp/src/qpid/sys/ssl/SslIo.cpp
rename to qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
index a58a137..734ebb4 100644
--- a/cpp/src/qpid/sys/ssl/SslIo.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
@@ -117,7 +117,7 @@
 SslConnector::SslConnector(const SslSocket& s,
                                  Poller::shared_ptr poller,
                                  std::string hostname,
-                                 uint16_t port,
+                                 std::string port,
                                  ConnectedCallback connCb,
                                  FailedCallback failCb) :
     DispatchHandle(s,
diff --git a/cpp/src/qpid/sys/ssl/SslIo.h b/qpid/cpp/src/qpid/sys/ssl/SslIo.h
similarity index 98%
rename from cpp/src/qpid/sys/ssl/SslIo.h
rename to qpid/cpp/src/qpid/sys/ssl/SslIo.h
index 53ac69d..8785852 100644
--- a/cpp/src/qpid/sys/ssl/SslIo.h
+++ b/qpid/cpp/src/qpid/sys/ssl/SslIo.h
@@ -73,7 +73,7 @@
     SslConnector(const SslSocket& socket,
                     Poller::shared_ptr poller,
                     std::string hostname,
-                    uint16_t port,
+                    std::string port,
                     ConnectedCallback connCb,
                     FailedCallback failCb = 0);
 
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.cpp b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
similarity index 98%
rename from cpp/src/qpid/sys/ssl/SslSocket.cpp
rename to qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
index 01e2658..f7483a2 100644
--- a/cpp/src/qpid/sys/ssl/SslSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
@@ -158,7 +158,7 @@
     PR_SetSocketOption(socket, &option);
 }
 
-void SslSocket::connect(const std::string& host, uint16_t port) const
+void SslSocket::connect(const std::string& host, const std::string& port) const
 {
     std::stringstream namestream;
     namestream << host << ":" << port;
@@ -180,7 +180,7 @@
     PRHostEnt hostEntry;
     PR_CHECK(PR_GetHostByName(host.data(), hostBuffer, PR_NETDB_BUF_SIZE, &hostEntry));
     PRNetAddr address;
-    int value = PR_EnumerateHostEnt(0, &hostEntry, port, &address);
+    int value = PR_EnumerateHostEnt(0, &hostEntry, boost::lexical_cast<PRUint16>(port), &address);
     if (value < 0) {
         throw Exception(QPID_MSG("Error getting address for host: " << ErrorString()));
     } else if (value == 0) {
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.h b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
similarity index 97%
rename from cpp/src/qpid/sys/ssl/SslSocket.h
rename to qpid/cpp/src/qpid/sys/ssl/SslSocket.h
index 25712c9..9938594 100644
--- a/cpp/src/qpid/sys/ssl/SslSocket.h
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
@@ -53,7 +53,7 @@
      * NSSInit().*/
     void setCertName(const std::string& certName);
 
-    void connect(const std::string& host, uint16_t port) const;
+    void connect(const std::string& host, const std::string& port) const;
 
     void close() const;
 
diff --git a/cpp/src/qpid/sys/ssl/check.cpp b/qpid/cpp/src/qpid/sys/ssl/check.cpp
similarity index 100%
rename from cpp/src/qpid/sys/ssl/check.cpp
rename to qpid/cpp/src/qpid/sys/ssl/check.cpp
diff --git a/cpp/src/qpid/sys/ssl/check.h b/qpid/cpp/src/qpid/sys/ssl/check.h
similarity index 100%
rename from cpp/src/qpid/sys/ssl/check.h
rename to qpid/cpp/src/qpid/sys/ssl/check.h
diff --git a/cpp/src/qpid/sys/ssl/util.cpp b/qpid/cpp/src/qpid/sys/ssl/util.cpp
similarity index 100%
rename from cpp/src/qpid/sys/ssl/util.cpp
rename to qpid/cpp/src/qpid/sys/ssl/util.cpp
diff --git a/cpp/src/qpid/sys/ssl/util.h b/qpid/cpp/src/qpid/sys/ssl/util.h
similarity index 100%
rename from cpp/src/qpid/sys/ssl/util.h
rename to qpid/cpp/src/qpid/sys/ssl/util.h
diff --git a/cpp/src/qpid/sys/uuid.h b/qpid/cpp/src/qpid/sys/uuid.h
similarity index 100%
rename from cpp/src/qpid/sys/uuid.h
rename to qpid/cpp/src/qpid/sys/uuid.h
diff --git a/cpp/src/qpid/sys/windows/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
similarity index 98%
rename from cpp/src/qpid/sys/windows/AsynchIO.cpp
rename to qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
index 7113875..8d84fdb 100644
--- a/cpp/src/qpid/sys/windows/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
@@ -175,20 +175,20 @@
     FailedCallback failCallback;
     const Socket& socket;
     const std::string hostname;
-    const uint16_t port;
+    const std::string port;
 
 public:
     AsynchConnector(const Socket& socket,
-                    std::string hostname,
-                    uint16_t port,
+                    const std::string& hostname,
+                    const std::string& port,
                     ConnectedCallback connCb,
                     FailedCallback failCb = 0);
     void start(Poller::shared_ptr poller);
 };
 
 AsynchConnector::AsynchConnector(const Socket& sock,
-                                 std::string hname,
-                                 uint16_t p,
+                                 const std::string& hname,
+                                 const std::string& p,
                                  ConnectedCallback connCb,
                                  FailedCallback failCb) :
     connCallback(connCb), failCallback(failCb), socket(sock),
@@ -218,8 +218,8 @@
 }
 
 AsynchConnector* qpid::sys::AsynchConnector::create(const Socket& s,
-                                                    std::string hostname,
-                                                    uint16_t port,
+                                                    const std::string& hostname,
+                                                    const std::string& port,
                                                     ConnectedCallback connCb,
                                                     FailedCallback failCb)
 {
diff --git a/cpp/src/qpid/sys/windows/AsynchIoResult.h b/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
similarity index 100%
rename from cpp/src/qpid/sys/windows/AsynchIoResult.h
rename to qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
diff --git a/cpp/src/qpid/sys/windows/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/FileSysDir.cpp
rename to qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
diff --git a/cpp/src/qpid/sys/windows/IOHandle.cpp b/qpid/cpp/src/qpid/sys/windows/IOHandle.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/IOHandle.cpp
rename to qpid/cpp/src/qpid/sys/windows/IOHandle.cpp
diff --git a/cpp/src/qpid/sys/windows/IoHandlePrivate.h b/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
similarity index 100%
rename from cpp/src/qpid/sys/windows/IoHandlePrivate.h
rename to qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
diff --git a/cpp/src/qpid/sys/windows/IocpPoller.cpp b/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/IocpPoller.cpp
rename to qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
diff --git a/cpp/src/qpid/sys/windows/LockFile.cpp b/qpid/cpp/src/qpid/sys/windows/LockFile.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/LockFile.cpp
rename to qpid/cpp/src/qpid/sys/windows/LockFile.cpp
diff --git a/cpp/src/qpid/sys/windows/PipeHandle.cpp b/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/PipeHandle.cpp
rename to qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp
diff --git a/cpp/src/qpid/sys/windows/PollableCondition.cpp b/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/PollableCondition.cpp
rename to qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
diff --git a/cpp/src/qpid/sys/windows/Shlib.cpp b/qpid/cpp/src/qpid/sys/windows/Shlib.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/Shlib.cpp
rename to qpid/cpp/src/qpid/sys/windows/Shlib.cpp
diff --git a/cpp/src/qpid/sys/windows/Socket.cpp b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
similarity index 74%
rename from cpp/src/qpid/sys/windows/Socket.cpp
rename to qpid/cpp/src/qpid/sys/windows/Socket.cpp
index 2ce274a..baa80f0 100755
--- a/cpp/src/qpid/sys/windows/Socket.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
@@ -89,7 +89,7 @@
 
 namespace {
 
-std::string getName(SOCKET fd, bool local, bool includeService = false)
+std::string getName(SOCKET fd, bool local)
 {
     sockaddr_in name; // big enough for any socket address    
     socklen_t namelen = sizeof(name);
@@ -101,41 +101,12 @@
 
     char servName[NI_MAXSERV];
     char dispName[NI_MAXHOST];
-    if (includeService) {
-        if (int rc = ::getnameinfo((sockaddr*)&name, namelen,
-                                   dispName, sizeof(dispName), 
-                                   servName, sizeof(servName), 
-                                   NI_NUMERICHOST | NI_NUMERICSERV) != 0)
-            throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
-        return std::string(dispName) + ":" + std::string(servName);
-    } else {
-        if (int rc = ::getnameinfo((sockaddr*)&name, namelen,
-                                   dispName, sizeof(dispName),
-                                   0, 0,
-                                   NI_NUMERICHOST) != 0)
-            throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
-        return dispName;
-    }
-}
-
-std::string getService(SOCKET fd, bool local)
-{
-    sockaddr_in name; // big enough for any socket address    
-    socklen_t namelen = sizeof(name);
-    
-    if (local) {
-        QPID_WINSOCK_CHECK(::getsockname(fd, (sockaddr*)&name, &namelen));
-    } else {
-        QPID_WINSOCK_CHECK(::getpeername(fd, (sockaddr*)&name, &namelen));
-    }
-
-    char servName[NI_MAXSERV];
     if (int rc = ::getnameinfo((sockaddr*)&name, namelen,
-                               0, 0, 
+                               dispName, sizeof(dispName), 
                                servName, sizeof(servName), 
                                NI_NUMERICHOST | NI_NUMERICSERV) != 0)
         throw qpid::Exception(QPID_MSG(gai_strerror(rc)));
-    return servName;
+    return std::string(dispName) + ":" + std::string(servName);
 }
 }  // namespace
 
@@ -179,34 +150,22 @@
     }
 }
 
-void Socket::setTimeout(const Duration& interval) const
-{
-    const SOCKET& socket = impl->fd;
-    int64_t nanosecs = interval;
-    nanosecs /= (1000 * 1000); // nsecs -> usec -> msec
-    int msec = 0;
-    if (nanosecs > std::numeric_limits<int>::max())
-        msec = std::numeric_limits<int>::max();
-    else
-        msec = static_cast<int>(nanosecs);
-    setsockopt(socket, SOL_SOCKET, SO_SNDTIMEO, (char *)&msec, sizeof(msec));
-    setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, (char *)&msec, sizeof(msec));
-}
-
 void Socket::setNonblocking() const {
     u_long nonblock = 1;
     QPID_WINSOCK_CHECK(ioctlsocket(impl->fd, FIONBIO, &nonblock));
 }
 
-void Socket::connect(const std::string& host, uint16_t port) const
+void Socket::connect(const std::string& host, const std::string& port) const
 {
-    SocketAddress sa(host, boost::lexical_cast<std::string>(port));
+    SocketAddress sa(host, port);
     connect(sa);
 }
 
 void
 Socket::connect(const SocketAddress& addr) const
 {
+    peername = addr.asString(false);
+
     const SOCKET& socket = impl->fd;
     const addrinfo *addrs = &(getAddrInfo(addr));
     int error = 0;
@@ -221,7 +180,7 @@
         addrs = addrs->ai_next;
     }
     if (error)
-        throw qpid::Exception(QPID_MSG(strError(error) << ": " << connectname));
+        throw qpid::Exception(QPID_MSG(strError(error) << ": " << peername));
 }
 
 void
@@ -252,7 +211,7 @@
     return received;
 }
 
-int Socket::listen(uint16_t port, int backlog) const
+int Socket::listen(const std::string&, const std::string& port, int backlog) const
 {
     const SOCKET& socket = impl->fd;
     BOOL yes=1;
@@ -260,7 +219,7 @@
     struct sockaddr_in name;
     memset(&name, 0, sizeof(name));
     name.sin_family = AF_INET;
-    name.sin_port = htons(port);
+    name.sin_port = htons(boost::lexical_cast<uint16_t>(port));
     name.sin_addr.s_addr = 0;
     if (::bind(socket, (struct sockaddr*)&name, sizeof(name)) == SOCKET_ERROR)
         throw Exception(QPID_MSG("Can't bind to port " << port << ": " << strError(WSAGetLastError())));
@@ -282,36 +241,18 @@
     else throw QPID_WINDOWS_ERROR(WSAGetLastError());
 }
 
-std::string Socket::getSockname() const
-{
-    return getName(impl->fd, true);
-}
-
-std::string Socket::getPeername() const
-{
-    return getName(impl->fd, false);
-}
-
 std::string Socket::getPeerAddress() const
 {
-    if (!connectname.empty())
-        return std::string (connectname);
-    return getName(impl->fd, false, true);
+    if (peername.empty())
+        peername = getName(impl->fd, false);
+    return peername;
 }
 
 std::string Socket::getLocalAddress() const
 {
-    return getName(impl->fd, true, true);
-}
-
-uint16_t Socket::getLocalPort() const
-{
-    return atoi(getService(impl->fd, true).c_str());
-}
-
-uint16_t Socket::getRemotePort() const
-{
-    return atoi(getService(impl->fd, true).c_str());
+    if (localname.empty())
+        localname = getName(impl->fd, true);
+    return localname;
 }
 
 int Socket::getError() const
diff --git a/cpp/src/qpid/sys/windows/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
similarity index 97%
rename from cpp/src/qpid/sys/windows/SocketAddress.cpp
rename to qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
index 5efdad0..ac43cd2 100644
--- a/cpp/src/qpid/sys/windows/SocketAddress.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
@@ -63,7 +63,7 @@
     ::freeaddrinfo(addrInfo);
 }
 
-std::string SocketAddress::asString() const
+std::string SocketAddress::asString(bool) const
 {
     return host + ":" + port;
 }
diff --git a/cpp/src/qpid/sys/windows/SslAsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/SslAsynchIO.cpp
rename to qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
diff --git a/cpp/src/qpid/sys/windows/SslAsynchIO.h b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.h
similarity index 100%
rename from cpp/src/qpid/sys/windows/SslAsynchIO.h
rename to qpid/cpp/src/qpid/sys/windows/SslAsynchIO.h
diff --git a/cpp/src/qpid/sys/windows/StrError.cpp b/qpid/cpp/src/qpid/sys/windows/StrError.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/StrError.cpp
rename to qpid/cpp/src/qpid/sys/windows/StrError.cpp
diff --git a/cpp/src/qpid/sys/windows/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/SystemInfo.cpp
rename to qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/windows/Thread.cpp b/qpid/cpp/src/qpid/sys/windows/Thread.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/Thread.cpp
rename to qpid/cpp/src/qpid/sys/windows/Thread.cpp
diff --git a/cpp/src/qpid/sys/windows/Time.cpp b/qpid/cpp/src/qpid/sys/windows/Time.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/Time.cpp
rename to qpid/cpp/src/qpid/sys/windows/Time.cpp
diff --git a/cpp/src/qpid/sys/windows/mingw32_compat.h b/qpid/cpp/src/qpid/sys/windows/mingw32_compat.h
similarity index 100%
rename from cpp/src/qpid/sys/windows/mingw32_compat.h
rename to qpid/cpp/src/qpid/sys/windows/mingw32_compat.h
diff --git a/cpp/src/qpid/sys/windows/uuid.cpp b/qpid/cpp/src/qpid/sys/windows/uuid.cpp
similarity index 100%
rename from cpp/src/qpid/sys/windows/uuid.cpp
rename to qpid/cpp/src/qpid/sys/windows/uuid.cpp
diff --git a/cpp/src/qpid/sys/windows/uuid.h b/qpid/cpp/src/qpid/sys/windows/uuid.h
similarity index 100%
rename from cpp/src/qpid/sys/windows/uuid.h
rename to qpid/cpp/src/qpid/sys/windows/uuid.h
diff --git a/cpp/src/qpid/types/Exception.cpp b/qpid/cpp/src/qpid/types/Exception.cpp
similarity index 100%
rename from cpp/src/qpid/types/Exception.cpp
rename to qpid/cpp/src/qpid/types/Exception.cpp
diff --git a/cpp/src/qpid/types/Uuid.cpp b/qpid/cpp/src/qpid/types/Uuid.cpp
similarity index 100%
rename from cpp/src/qpid/types/Uuid.cpp
rename to qpid/cpp/src/qpid/types/Uuid.cpp
diff --git a/cpp/src/qpid/types/Variant.cpp b/qpid/cpp/src/qpid/types/Variant.cpp
similarity index 100%
rename from cpp/src/qpid/types/Variant.cpp
rename to qpid/cpp/src/qpid/types/Variant.cpp
diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/qpid/cpp/src/qpid/xml/XmlExchange.cpp
similarity index 100%
rename from cpp/src/qpid/xml/XmlExchange.cpp
rename to qpid/cpp/src/qpid/xml/XmlExchange.cpp
diff --git a/cpp/src/qpid/xml/XmlExchange.h b/qpid/cpp/src/qpid/xml/XmlExchange.h
similarity index 100%
rename from cpp/src/qpid/xml/XmlExchange.h
rename to qpid/cpp/src/qpid/xml/XmlExchange.h
diff --git a/cpp/src/qpid/xml/XmlExchangePlugin.cpp b/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
similarity index 100%
rename from cpp/src/qpid/xml/XmlExchangePlugin.cpp
rename to qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
diff --git a/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
similarity index 100%
rename from cpp/src/qpidd.cpp
rename to qpid/cpp/src/qpidd.cpp
diff --git a/cpp/src/qpidd.h b/qpid/cpp/src/qpidd.h
similarity index 100%
rename from cpp/src/qpidd.h
rename to qpid/cpp/src/qpidd.h
diff --git a/cpp/src/rdma.cmake b/qpid/cpp/src/rdma.cmake
similarity index 100%
rename from cpp/src/rdma.cmake
rename to qpid/cpp/src/rdma.cmake
diff --git a/cpp/src/replication.mk b/qpid/cpp/src/replication.mk
similarity index 100%
rename from cpp/src/replication.mk
rename to qpid/cpp/src/replication.mk
diff --git a/cpp/src/ssl.cmake b/qpid/cpp/src/ssl.cmake
similarity index 100%
rename from cpp/src/ssl.cmake
rename to qpid/cpp/src/ssl.cmake
diff --git a/cpp/src/ssl.mk b/qpid/cpp/src/ssl.mk
similarity index 100%
rename from cpp/src/ssl.mk
rename to qpid/cpp/src/ssl.mk
diff --git a/cpp/src/tests/.valgrind.supp b/qpid/cpp/src/tests/.valgrind.supp
similarity index 100%
rename from cpp/src/tests/.valgrind.supp
rename to qpid/cpp/src/tests/.valgrind.supp
diff --git a/cpp/src/tests/AccumulatedAckTest.cpp b/qpid/cpp/src/tests/AccumulatedAckTest.cpp
similarity index 100%
rename from cpp/src/tests/AccumulatedAckTest.cpp
rename to qpid/cpp/src/tests/AccumulatedAckTest.cpp
diff --git a/cpp/src/tests/Address.cpp b/qpid/cpp/src/tests/Address.cpp
similarity index 100%
rename from cpp/src/tests/Address.cpp
rename to qpid/cpp/src/tests/Address.cpp
diff --git a/cpp/src/tests/Array.cpp b/qpid/cpp/src/tests/Array.cpp
similarity index 100%
rename from cpp/src/tests/Array.cpp
rename to qpid/cpp/src/tests/Array.cpp
diff --git a/cpp/src/tests/AsyncCompletion.cpp b/qpid/cpp/src/tests/AsyncCompletion.cpp
similarity index 100%
rename from cpp/src/tests/AsyncCompletion.cpp
rename to qpid/cpp/src/tests/AsyncCompletion.cpp
diff --git a/cpp/src/tests/AtomicValue.cpp b/qpid/cpp/src/tests/AtomicValue.cpp
similarity index 100%
rename from cpp/src/tests/AtomicValue.cpp
rename to qpid/cpp/src/tests/AtomicValue.cpp
diff --git a/cpp/src/tests/Blob.cpp b/qpid/cpp/src/tests/Blob.cpp
similarity index 100%
rename from cpp/src/tests/Blob.cpp
rename to qpid/cpp/src/tests/Blob.cpp
diff --git a/cpp/src/tests/BrokerFixture.h b/qpid/cpp/src/tests/BrokerFixture.h
similarity index 100%
rename from cpp/src/tests/BrokerFixture.h
rename to qpid/cpp/src/tests/BrokerFixture.h
diff --git a/cpp/src/tests/BrokerMgmtAgent.cpp b/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
similarity index 100%
rename from cpp/src/tests/BrokerMgmtAgent.cpp
rename to qpid/cpp/src/tests/BrokerMgmtAgent.cpp
diff --git a/cpp/src/tests/BrokerMgmtAgent.xml b/qpid/cpp/src/tests/BrokerMgmtAgent.xml
similarity index 100%
rename from cpp/src/tests/BrokerMgmtAgent.xml
rename to qpid/cpp/src/tests/BrokerMgmtAgent.xml
diff --git a/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt
similarity index 100%
rename from cpp/src/tests/CMakeLists.txt
rename to qpid/cpp/src/tests/CMakeLists.txt
diff --git a/cpp/src/tests/ClientMessage.cpp b/qpid/cpp/src/tests/ClientMessage.cpp
similarity index 100%
rename from cpp/src/tests/ClientMessage.cpp
rename to qpid/cpp/src/tests/ClientMessage.cpp
diff --git a/cpp/src/tests/ClientMessageTest.cpp b/qpid/cpp/src/tests/ClientMessageTest.cpp
similarity index 100%
rename from cpp/src/tests/ClientMessageTest.cpp
rename to qpid/cpp/src/tests/ClientMessageTest.cpp
diff --git a/cpp/src/tests/ClientSessionTest.cpp b/qpid/cpp/src/tests/ClientSessionTest.cpp
similarity index 98%
rename from cpp/src/tests/ClientSessionTest.cpp
rename to qpid/cpp/src/tests/ClientSessionTest.cpp
index 939f8f2..3c0cff7 100644
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ b/qpid/cpp/src/tests/ClientSessionTest.cpp
@@ -271,8 +271,12 @@
 QPID_AUTO_TEST_CASE(testPeriodicExpiration) {
     Broker::Options opts;
     opts.queueCleanInterval = 1;
+    opts.queueFlowStopRatio = 0;
+    opts.queueFlowResumeRatio = 0;
     ClientSessionFixture fix(opts);
-    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true);
+    FieldTable args;
+    args.setInt("qpid.max_count",10);
+    fix.session.queueDeclare(arg::queue="my-queue", arg::exclusive=true, arg::autoDelete=true, arg::arguments=args);
 
     for (uint i = 0; i < 10; i++) {
         Message m((boost::format("Message_%1%") % (i+1)).str(), "my-queue");
@@ -283,6 +287,7 @@
     BOOST_CHECK_EQUAL(fix.session.queueQuery(string("my-queue")).getMessageCount(), 10u);
     qpid::sys::sleep(2);
     BOOST_CHECK_EQUAL(fix.session.queueQuery(string("my-queue")).getMessageCount(), 5u);
+    fix.session.messageTransfer(arg::content=Message("Message_11", "my-queue"));//ensure policy is also updated
 }
 
 QPID_AUTO_TEST_CASE(testExpirationOnPop) {
diff --git a/cpp/src/tests/ClusterFailover.cpp b/qpid/cpp/src/tests/ClusterFailover.cpp
similarity index 100%
rename from cpp/src/tests/ClusterFailover.cpp
rename to qpid/cpp/src/tests/ClusterFailover.cpp
diff --git a/cpp/src/tests/ClusterFixture.cpp b/qpid/cpp/src/tests/ClusterFixture.cpp
similarity index 100%
rename from cpp/src/tests/ClusterFixture.cpp
rename to qpid/cpp/src/tests/ClusterFixture.cpp
diff --git a/cpp/src/tests/ClusterFixture.h b/qpid/cpp/src/tests/ClusterFixture.h
similarity index 100%
rename from cpp/src/tests/ClusterFixture.h
rename to qpid/cpp/src/tests/ClusterFixture.h
diff --git a/cpp/src/tests/ConnectionOptions.h b/qpid/cpp/src/tests/ConnectionOptions.h
similarity index 100%
rename from cpp/src/tests/ConnectionOptions.h
rename to qpid/cpp/src/tests/ConnectionOptions.h
diff --git a/cpp/src/tests/ConsoleTest.cpp b/qpid/cpp/src/tests/ConsoleTest.cpp
similarity index 100%
rename from cpp/src/tests/ConsoleTest.cpp
rename to qpid/cpp/src/tests/ConsoleTest.cpp
diff --git a/cpp/src/tests/DeliveryRecordTest.cpp b/qpid/cpp/src/tests/DeliveryRecordTest.cpp
similarity index 100%
rename from cpp/src/tests/DeliveryRecordTest.cpp
rename to qpid/cpp/src/tests/DeliveryRecordTest.cpp
diff --git a/cpp/src/tests/DispatcherTest.cpp b/qpid/cpp/src/tests/DispatcherTest.cpp
similarity index 100%
rename from cpp/src/tests/DispatcherTest.cpp
rename to qpid/cpp/src/tests/DispatcherTest.cpp
diff --git a/cpp/src/tests/DtxWorkRecordTest.cpp b/qpid/cpp/src/tests/DtxWorkRecordTest.cpp
similarity index 100%
rename from cpp/src/tests/DtxWorkRecordTest.cpp
rename to qpid/cpp/src/tests/DtxWorkRecordTest.cpp
diff --git a/cpp/src/tests/ExchangeTest.cpp b/qpid/cpp/src/tests/ExchangeTest.cpp
similarity index 100%
rename from cpp/src/tests/ExchangeTest.cpp
rename to qpid/cpp/src/tests/ExchangeTest.cpp
diff --git a/cpp/src/tests/FieldTable.cpp b/qpid/cpp/src/tests/FieldTable.cpp
similarity index 100%
rename from cpp/src/tests/FieldTable.cpp
rename to qpid/cpp/src/tests/FieldTable.cpp
diff --git a/cpp/src/tests/FieldValue.cpp b/qpid/cpp/src/tests/FieldValue.cpp
similarity index 100%
rename from cpp/src/tests/FieldValue.cpp
rename to qpid/cpp/src/tests/FieldValue.cpp
diff --git a/cpp/src/tests/ForkedBroker.cpp b/qpid/cpp/src/tests/ForkedBroker.cpp
similarity index 100%
rename from cpp/src/tests/ForkedBroker.cpp
rename to qpid/cpp/src/tests/ForkedBroker.cpp
diff --git a/cpp/src/tests/ForkedBroker.h b/qpid/cpp/src/tests/ForkedBroker.h
similarity index 100%
rename from cpp/src/tests/ForkedBroker.h
rename to qpid/cpp/src/tests/ForkedBroker.h
diff --git a/cpp/src/tests/Frame.cpp b/qpid/cpp/src/tests/Frame.cpp
similarity index 100%
rename from cpp/src/tests/Frame.cpp
rename to qpid/cpp/src/tests/Frame.cpp
diff --git a/cpp/src/tests/FrameDecoder.cpp b/qpid/cpp/src/tests/FrameDecoder.cpp
similarity index 100%
rename from cpp/src/tests/FrameDecoder.cpp
rename to qpid/cpp/src/tests/FrameDecoder.cpp
diff --git a/cpp/src/tests/FramingTest.cpp b/qpid/cpp/src/tests/FramingTest.cpp
similarity index 100%
rename from cpp/src/tests/FramingTest.cpp
rename to qpid/cpp/src/tests/FramingTest.cpp
diff --git a/cpp/src/tests/HeaderTest.cpp b/qpid/cpp/src/tests/HeaderTest.cpp
similarity index 100%
rename from cpp/src/tests/HeaderTest.cpp
rename to qpid/cpp/src/tests/HeaderTest.cpp
diff --git a/cpp/src/tests/HeadersExchangeTest.cpp b/qpid/cpp/src/tests/HeadersExchangeTest.cpp
similarity index 100%
rename from cpp/src/tests/HeadersExchangeTest.cpp
rename to qpid/cpp/src/tests/HeadersExchangeTest.cpp
diff --git a/cpp/src/tests/InitialStatusMap.cpp b/qpid/cpp/src/tests/InitialStatusMap.cpp
similarity index 100%
rename from cpp/src/tests/InitialStatusMap.cpp
rename to qpid/cpp/src/tests/InitialStatusMap.cpp
diff --git a/cpp/src/tests/InlineAllocator.cpp b/qpid/cpp/src/tests/InlineAllocator.cpp
similarity index 100%
rename from cpp/src/tests/InlineAllocator.cpp
rename to qpid/cpp/src/tests/InlineAllocator.cpp
diff --git a/cpp/src/tests/InlineVector.cpp b/qpid/cpp/src/tests/InlineVector.cpp
similarity index 100%
rename from cpp/src/tests/InlineVector.cpp
rename to qpid/cpp/src/tests/InlineVector.cpp
diff --git a/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
similarity index 100%
rename from cpp/src/tests/Makefile.am
rename to qpid/cpp/src/tests/Makefile.am
diff --git a/cpp/src/tests/ManagementTest.cpp b/qpid/cpp/src/tests/ManagementTest.cpp
similarity index 100%
rename from cpp/src/tests/ManagementTest.cpp
rename to qpid/cpp/src/tests/ManagementTest.cpp
diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/qpid/cpp/src/tests/MessageBuilderTest.cpp
similarity index 100%
rename from cpp/src/tests/MessageBuilderTest.cpp
rename to qpid/cpp/src/tests/MessageBuilderTest.cpp
diff --git a/cpp/src/tests/MessageReplayTracker.cpp b/qpid/cpp/src/tests/MessageReplayTracker.cpp
similarity index 100%
rename from cpp/src/tests/MessageReplayTracker.cpp
rename to qpid/cpp/src/tests/MessageReplayTracker.cpp
diff --git a/cpp/src/tests/MessageTest.cpp b/qpid/cpp/src/tests/MessageTest.cpp
similarity index 100%
rename from cpp/src/tests/MessageTest.cpp
rename to qpid/cpp/src/tests/MessageTest.cpp
diff --git a/cpp/src/tests/MessageUtils.h b/qpid/cpp/src/tests/MessageUtils.h
similarity index 100%
rename from cpp/src/tests/MessageUtils.h
rename to qpid/cpp/src/tests/MessageUtils.h
diff --git a/cpp/src/tests/MessagingFixture.h b/qpid/cpp/src/tests/MessagingFixture.h
similarity index 100%
rename from cpp/src/tests/MessagingFixture.h
rename to qpid/cpp/src/tests/MessagingFixture.h
diff --git a/cpp/src/tests/MessagingSessionTests.cpp b/qpid/cpp/src/tests/MessagingSessionTests.cpp
similarity index 100%
rename from cpp/src/tests/MessagingSessionTests.cpp
rename to qpid/cpp/src/tests/MessagingSessionTests.cpp
diff --git a/cpp/src/tests/MessagingThreadTests.cpp b/qpid/cpp/src/tests/MessagingThreadTests.cpp
similarity index 100%
rename from cpp/src/tests/MessagingThreadTests.cpp
rename to qpid/cpp/src/tests/MessagingThreadTests.cpp
diff --git a/cpp/src/tests/PartialFailure.cpp b/qpid/cpp/src/tests/PartialFailure.cpp
similarity index 100%
rename from cpp/src/tests/PartialFailure.cpp
rename to qpid/cpp/src/tests/PartialFailure.cpp
diff --git a/cpp/src/tests/PollableCondition.cpp b/qpid/cpp/src/tests/PollableCondition.cpp
similarity index 100%
rename from cpp/src/tests/PollableCondition.cpp
rename to qpid/cpp/src/tests/PollableCondition.cpp
diff --git a/cpp/src/tests/PollerTest.cpp b/qpid/cpp/src/tests/PollerTest.cpp
similarity index 100%
rename from cpp/src/tests/PollerTest.cpp
rename to qpid/cpp/src/tests/PollerTest.cpp
diff --git a/cpp/src/tests/ProxyTest.cpp b/qpid/cpp/src/tests/ProxyTest.cpp
similarity index 100%
rename from cpp/src/tests/ProxyTest.cpp
rename to qpid/cpp/src/tests/ProxyTest.cpp
diff --git a/cpp/src/tests/Qmf2.cpp b/qpid/cpp/src/tests/Qmf2.cpp
similarity index 100%
rename from cpp/src/tests/Qmf2.cpp
rename to qpid/cpp/src/tests/Qmf2.cpp
diff --git a/cpp/src/tests/QueueEvents.cpp b/qpid/cpp/src/tests/QueueEvents.cpp
similarity index 100%
rename from cpp/src/tests/QueueEvents.cpp
rename to qpid/cpp/src/tests/QueueEvents.cpp
diff --git a/cpp/src/tests/QueueFlowLimitTest.cpp b/qpid/cpp/src/tests/QueueFlowLimitTest.cpp
similarity index 100%
rename from cpp/src/tests/QueueFlowLimitTest.cpp
rename to qpid/cpp/src/tests/QueueFlowLimitTest.cpp
diff --git a/cpp/src/tests/QueueOptionsTest.cpp b/qpid/cpp/src/tests/QueueOptionsTest.cpp
similarity index 100%
rename from cpp/src/tests/QueueOptionsTest.cpp
rename to qpid/cpp/src/tests/QueueOptionsTest.cpp
diff --git a/cpp/src/tests/QueuePolicyTest.cpp b/qpid/cpp/src/tests/QueuePolicyTest.cpp
similarity index 100%
rename from cpp/src/tests/QueuePolicyTest.cpp
rename to qpid/cpp/src/tests/QueuePolicyTest.cpp
diff --git a/cpp/src/tests/QueueRegistryTest.cpp b/qpid/cpp/src/tests/QueueRegistryTest.cpp
similarity index 100%
rename from cpp/src/tests/QueueRegistryTest.cpp
rename to qpid/cpp/src/tests/QueueRegistryTest.cpp
diff --git a/cpp/src/tests/QueueTest.cpp b/qpid/cpp/src/tests/QueueTest.cpp
similarity index 100%
rename from cpp/src/tests/QueueTest.cpp
rename to qpid/cpp/src/tests/QueueTest.cpp
diff --git a/cpp/src/tests/README.txt b/qpid/cpp/src/tests/README.txt
similarity index 100%
rename from cpp/src/tests/README.txt
rename to qpid/cpp/src/tests/README.txt
diff --git a/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp
similarity index 100%
rename from cpp/src/tests/RangeSet.cpp
rename to qpid/cpp/src/tests/RangeSet.cpp
diff --git a/cpp/src/tests/RateFlowcontrolTest.cpp b/qpid/cpp/src/tests/RateFlowcontrolTest.cpp
similarity index 100%
rename from cpp/src/tests/RateFlowcontrolTest.cpp
rename to qpid/cpp/src/tests/RateFlowcontrolTest.cpp
diff --git a/cpp/src/tests/RefCounted.cpp b/qpid/cpp/src/tests/RefCounted.cpp
similarity index 100%
rename from cpp/src/tests/RefCounted.cpp
rename to qpid/cpp/src/tests/RefCounted.cpp
diff --git a/cpp/src/tests/ReplicationTest.cpp b/qpid/cpp/src/tests/ReplicationTest.cpp
similarity index 100%
rename from cpp/src/tests/ReplicationTest.cpp
rename to qpid/cpp/src/tests/ReplicationTest.cpp
diff --git a/cpp/src/tests/RetryList.cpp b/qpid/cpp/src/tests/RetryList.cpp
similarity index 100%
rename from cpp/src/tests/RetryList.cpp
rename to qpid/cpp/src/tests/RetryList.cpp
diff --git a/cpp/src/tests/SequenceNumberTest.cpp b/qpid/cpp/src/tests/SequenceNumberTest.cpp
similarity index 100%
rename from cpp/src/tests/SequenceNumberTest.cpp
rename to qpid/cpp/src/tests/SequenceNumberTest.cpp
diff --git a/cpp/src/tests/SequenceSet.cpp b/qpid/cpp/src/tests/SequenceSet.cpp
similarity index 100%
rename from cpp/src/tests/SequenceSet.cpp
rename to qpid/cpp/src/tests/SequenceSet.cpp
diff --git a/cpp/src/tests/SessionState.cpp b/qpid/cpp/src/tests/SessionState.cpp
similarity index 100%
rename from cpp/src/tests/SessionState.cpp
rename to qpid/cpp/src/tests/SessionState.cpp
diff --git a/cpp/src/tests/Shlib.cpp b/qpid/cpp/src/tests/Shlib.cpp
similarity index 100%
rename from cpp/src/tests/Shlib.cpp
rename to qpid/cpp/src/tests/Shlib.cpp
diff --git a/cpp/src/tests/SocketProxy.h b/qpid/cpp/src/tests/SocketProxy.h
similarity index 97%
rename from cpp/src/tests/SocketProxy.h
rename to qpid/cpp/src/tests/SocketProxy.h
index 0c6f39d..d195f11 100644
--- a/cpp/src/tests/SocketProxy.h
+++ b/qpid/cpp/src/tests/SocketProxy.h
@@ -35,6 +35,8 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/log/Statement.h"
 
+#include <boost/lexical_cast.hpp>
+
 namespace qpid {
 namespace tests {
 
@@ -62,7 +64,7 @@
       : closed(false), joined(true),
         port(listener.listen()), dropClient(), dropServer()
     {
-        client.connect(host, connectPort);
+        client.connect(host, boost::lexical_cast<std::string>(connectPort));
         joined = false;
         thread = qpid::sys::Thread(static_cast<qpid::sys::Runnable*>(this));
     }
diff --git a/cpp/src/tests/Statistics.cpp b/qpid/cpp/src/tests/Statistics.cpp
similarity index 100%
rename from cpp/src/tests/Statistics.cpp
rename to qpid/cpp/src/tests/Statistics.cpp
diff --git a/cpp/src/tests/Statistics.h b/qpid/cpp/src/tests/Statistics.h
similarity index 100%
rename from cpp/src/tests/Statistics.h
rename to qpid/cpp/src/tests/Statistics.h
diff --git a/cpp/src/tests/StoreStatus.cpp b/qpid/cpp/src/tests/StoreStatus.cpp
similarity index 100%
rename from cpp/src/tests/StoreStatus.cpp
rename to qpid/cpp/src/tests/StoreStatus.cpp
diff --git a/cpp/src/tests/StringUtils.cpp b/qpid/cpp/src/tests/StringUtils.cpp
similarity index 100%
rename from cpp/src/tests/StringUtils.cpp
rename to qpid/cpp/src/tests/StringUtils.cpp
diff --git a/cpp/src/tests/TestMessageStore.h b/qpid/cpp/src/tests/TestMessageStore.h
similarity index 100%
rename from cpp/src/tests/TestMessageStore.h
rename to qpid/cpp/src/tests/TestMessageStore.h
diff --git a/cpp/src/tests/TestOptions.h b/qpid/cpp/src/tests/TestOptions.h
similarity index 100%
rename from cpp/src/tests/TestOptions.h
rename to qpid/cpp/src/tests/TestOptions.h
diff --git a/cpp/src/tests/TimerTest.cpp b/qpid/cpp/src/tests/TimerTest.cpp
similarity index 100%
rename from cpp/src/tests/TimerTest.cpp
rename to qpid/cpp/src/tests/TimerTest.cpp
diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/qpid/cpp/src/tests/TopicExchangeTest.cpp
similarity index 100%
rename from cpp/src/tests/TopicExchangeTest.cpp
rename to qpid/cpp/src/tests/TopicExchangeTest.cpp
diff --git a/cpp/src/tests/TxBufferTest.cpp b/qpid/cpp/src/tests/TxBufferTest.cpp
similarity index 100%
rename from cpp/src/tests/TxBufferTest.cpp
rename to qpid/cpp/src/tests/TxBufferTest.cpp
diff --git a/cpp/src/tests/TxMocks.h b/qpid/cpp/src/tests/TxMocks.h
similarity index 100%
rename from cpp/src/tests/TxMocks.h
rename to qpid/cpp/src/tests/TxMocks.h
diff --git a/cpp/src/tests/TxPublishTest.cpp b/qpid/cpp/src/tests/TxPublishTest.cpp
similarity index 100%
rename from cpp/src/tests/TxPublishTest.cpp
rename to qpid/cpp/src/tests/TxPublishTest.cpp
diff --git a/cpp/src/tests/Url.cpp b/qpid/cpp/src/tests/Url.cpp
similarity index 100%
rename from cpp/src/tests/Url.cpp
rename to qpid/cpp/src/tests/Url.cpp
diff --git a/cpp/src/tests/Uuid.cpp b/qpid/cpp/src/tests/Uuid.cpp
similarity index 100%
rename from cpp/src/tests/Uuid.cpp
rename to qpid/cpp/src/tests/Uuid.cpp
diff --git a/cpp/src/tests/Variant.cpp b/qpid/cpp/src/tests/Variant.cpp
similarity index 100%
rename from cpp/src/tests/Variant.cpp
rename to qpid/cpp/src/tests/Variant.cpp
diff --git a/cpp/src/tests/XmlClientSessionTest.cpp b/qpid/cpp/src/tests/XmlClientSessionTest.cpp
similarity index 100%
rename from cpp/src/tests/XmlClientSessionTest.cpp
rename to qpid/cpp/src/tests/XmlClientSessionTest.cpp
diff --git a/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py
similarity index 100%
rename from cpp/src/tests/acl.py
rename to qpid/cpp/src/tests/acl.py
diff --git a/cpp/src/tests/ais_check b/qpid/cpp/src/tests/ais_check
similarity index 100%
rename from cpp/src/tests/ais_check
rename to qpid/cpp/src/tests/ais_check
diff --git a/cpp/src/tests/ais_test.cpp b/qpid/cpp/src/tests/ais_test.cpp
similarity index 100%
rename from cpp/src/tests/ais_test.cpp
rename to qpid/cpp/src/tests/ais_test.cpp
diff --git a/cpp/src/tests/allhosts b/qpid/cpp/src/tests/allhosts
similarity index 100%
rename from cpp/src/tests/allhosts
rename to qpid/cpp/src/tests/allhosts
diff --git a/cpp/src/tests/amqp_0_10/Map.cpp b/qpid/cpp/src/tests/amqp_0_10/Map.cpp
similarity index 100%
rename from cpp/src/tests/amqp_0_10/Map.cpp
rename to qpid/cpp/src/tests/amqp_0_10/Map.cpp
diff --git a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp b/qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
similarity index 100%
rename from cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
rename to qpid/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp
diff --git a/cpp/src/tests/amqp_0_10/apply.cpp b/qpid/cpp/src/tests/amqp_0_10/apply.cpp
similarity index 100%
rename from cpp/src/tests/amqp_0_10/apply.cpp
rename to qpid/cpp/src/tests/amqp_0_10/apply.cpp
diff --git a/cpp/src/tests/amqp_0_10/handlers.cpp b/qpid/cpp/src/tests/amqp_0_10/handlers.cpp
similarity index 100%
rename from cpp/src/tests/amqp_0_10/handlers.cpp
rename to qpid/cpp/src/tests/amqp_0_10/handlers.cpp
diff --git a/cpp/src/tests/amqp_0_10/serialize.cpp b/qpid/cpp/src/tests/amqp_0_10/serialize.cpp
similarity index 100%
rename from cpp/src/tests/amqp_0_10/serialize.cpp
rename to qpid/cpp/src/tests/amqp_0_10/serialize.cpp
diff --git a/cpp/src/tests/background.ps1 b/qpid/cpp/src/tests/background.ps1
similarity index 100%
rename from cpp/src/tests/background.ps1
rename to qpid/cpp/src/tests/background.ps1
diff --git a/cpp/src/tests/benchmark b/qpid/cpp/src/tests/benchmark
similarity index 100%
rename from cpp/src/tests/benchmark
rename to qpid/cpp/src/tests/benchmark
diff --git a/cpp/src/tests/brokermgmt.mk b/qpid/cpp/src/tests/brokermgmt.mk
similarity index 100%
rename from cpp/src/tests/brokermgmt.mk
rename to qpid/cpp/src/tests/brokermgmt.mk
diff --git a/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
similarity index 100%
rename from cpp/src/tests/brokertest.py
rename to qpid/cpp/src/tests/brokertest.py
diff --git a/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py
similarity index 100%
rename from cpp/src/tests/cli_tests.py
rename to qpid/cpp/src/tests/cli_tests.py
diff --git a/cpp/src/tests/cluster.cmake b/qpid/cpp/src/tests/cluster.cmake
similarity index 100%
rename from cpp/src/tests/cluster.cmake
rename to qpid/cpp/src/tests/cluster.cmake
diff --git a/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk
similarity index 100%
rename from cpp/src/tests/cluster.mk
rename to qpid/cpp/src/tests/cluster.mk
diff --git a/cpp/src/tests/cluster_authentication_soak.cpp b/qpid/cpp/src/tests/cluster_authentication_soak.cpp
similarity index 100%
rename from cpp/src/tests/cluster_authentication_soak.cpp
rename to qpid/cpp/src/tests/cluster_authentication_soak.cpp
diff --git a/cpp/src/tests/cluster_python_tests b/qpid/cpp/src/tests/cluster_python_tests
similarity index 100%
rename from cpp/src/tests/cluster_python_tests
rename to qpid/cpp/src/tests/cluster_python_tests
diff --git a/cpp/src/tests/cluster_python_tests_failing.txt b/qpid/cpp/src/tests/cluster_python_tests_failing.txt
similarity index 100%
rename from cpp/src/tests/cluster_python_tests_failing.txt
rename to qpid/cpp/src/tests/cluster_python_tests_failing.txt
diff --git a/cpp/src/tests/cluster_read_credit b/qpid/cpp/src/tests/cluster_read_credit
similarity index 100%
rename from cpp/src/tests/cluster_read_credit
rename to qpid/cpp/src/tests/cluster_read_credit
diff --git a/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp
similarity index 100%
rename from cpp/src/tests/cluster_test.cpp
rename to qpid/cpp/src/tests/cluster_test.cpp
diff --git a/cpp/src/tests/cluster_test_logs.py b/qpid/cpp/src/tests/cluster_test_logs.py
similarity index 100%
rename from cpp/src/tests/cluster_test_logs.py
rename to qpid/cpp/src/tests/cluster_test_logs.py
diff --git a/cpp/src/tests/cluster_test_scripts/README.txt b/qpid/cpp/src/tests/cluster_test_scripts/README.txt
similarity index 100%
rename from cpp/src/tests/cluster_test_scripts/README.txt
rename to qpid/cpp/src/tests/cluster_test_scripts/README.txt
diff --git a/cpp/src/tests/cluster_test_scripts/cluster_check b/qpid/cpp/src/tests/cluster_test_scripts/cluster_check
similarity index 100%
rename from cpp/src/tests/cluster_test_scripts/cluster_check
rename to qpid/cpp/src/tests/cluster_test_scripts/cluster_check
diff --git a/cpp/src/tests/cluster_test_scripts/cluster_start b/qpid/cpp/src/tests/cluster_test_scripts/cluster_start
similarity index 100%
rename from cpp/src/tests/cluster_test_scripts/cluster_start
rename to qpid/cpp/src/tests/cluster_test_scripts/cluster_start
diff --git a/cpp/src/tests/cluster_test_scripts/cluster_stop b/qpid/cpp/src/tests/cluster_test_scripts/cluster_stop
similarity index 100%
rename from cpp/src/tests/cluster_test_scripts/cluster_stop
rename to qpid/cpp/src/tests/cluster_test_scripts/cluster_stop
diff --git a/cpp/src/tests/cluster_test_scripts/config_example.sh b/qpid/cpp/src/tests/cluster_test_scripts/config_example.sh
similarity index 100%
rename from cpp/src/tests/cluster_test_scripts/config_example.sh
rename to qpid/cpp/src/tests/cluster_test_scripts/config_example.sh
diff --git a/cpp/src/tests/cluster_test_scripts/perftest b/qpid/cpp/src/tests/cluster_test_scripts/perftest
similarity index 100%
rename from cpp/src/tests/cluster_test_scripts/perftest
rename to qpid/cpp/src/tests/cluster_test_scripts/perftest
diff --git a/cpp/src/tests/cluster_tests.fail b/qpid/cpp/src/tests/cluster_tests.fail
similarity index 100%
rename from cpp/src/tests/cluster_tests.fail
rename to qpid/cpp/src/tests/cluster_tests.fail
diff --git a/cpp/src/tests/cluster_tests.py b/qpid/cpp/src/tests/cluster_tests.py
similarity index 100%
rename from cpp/src/tests/cluster_tests.py
rename to qpid/cpp/src/tests/cluster_tests.py
diff --git a/cpp/src/tests/clustered_replication_test b/qpid/cpp/src/tests/clustered_replication_test
similarity index 100%
rename from cpp/src/tests/clustered_replication_test
rename to qpid/cpp/src/tests/clustered_replication_test
diff --git a/cpp/src/tests/config.null b/qpid/cpp/src/tests/config.null
similarity index 100%
rename from cpp/src/tests/config.null
rename to qpid/cpp/src/tests/config.null
diff --git a/cpp/src/tests/consume.cpp b/qpid/cpp/src/tests/consume.cpp
similarity index 100%
rename from cpp/src/tests/consume.cpp
rename to qpid/cpp/src/tests/consume.cpp
diff --git a/cpp/src/tests/datagen.cpp b/qpid/cpp/src/tests/datagen.cpp
similarity index 100%
rename from cpp/src/tests/datagen.cpp
rename to qpid/cpp/src/tests/datagen.cpp
diff --git a/cpp/src/tests/declare_queues.cpp b/qpid/cpp/src/tests/declare_queues.cpp
similarity index 100%
rename from cpp/src/tests/declare_queues.cpp
rename to qpid/cpp/src/tests/declare_queues.cpp
diff --git a/cpp/src/tests/dlclose_noop.c b/qpid/cpp/src/tests/dlclose_noop.c
similarity index 100%
rename from cpp/src/tests/dlclose_noop.c
rename to qpid/cpp/src/tests/dlclose_noop.c
diff --git a/cpp/src/tests/dynamic_log_level_test b/qpid/cpp/src/tests/dynamic_log_level_test
similarity index 100%
rename from cpp/src/tests/dynamic_log_level_test
rename to qpid/cpp/src/tests/dynamic_log_level_test
diff --git a/cpp/src/tests/echotest.cpp b/qpid/cpp/src/tests/echotest.cpp
similarity index 100%
rename from cpp/src/tests/echotest.cpp
rename to qpid/cpp/src/tests/echotest.cpp
diff --git a/cpp/src/tests/exception_test.cpp b/qpid/cpp/src/tests/exception_test.cpp
similarity index 100%
rename from cpp/src/tests/exception_test.cpp
rename to qpid/cpp/src/tests/exception_test.cpp
diff --git a/cpp/src/tests/failover_soak.cpp b/qpid/cpp/src/tests/failover_soak.cpp
similarity index 100%
rename from cpp/src/tests/failover_soak.cpp
rename to qpid/cpp/src/tests/failover_soak.cpp
diff --git a/cpp/src/tests/fanout_perftest b/qpid/cpp/src/tests/fanout_perftest
similarity index 100%
rename from cpp/src/tests/fanout_perftest
rename to qpid/cpp/src/tests/fanout_perftest
diff --git a/cpp/src/tests/federated_cluster_test b/qpid/cpp/src/tests/federated_cluster_test
similarity index 100%
rename from cpp/src/tests/federated_cluster_test
rename to qpid/cpp/src/tests/federated_cluster_test
diff --git a/cpp/src/tests/federated_cluster_test_with_node_failure b/qpid/cpp/src/tests/federated_cluster_test_with_node_failure
similarity index 100%
rename from cpp/src/tests/federated_cluster_test_with_node_failure
rename to qpid/cpp/src/tests/federated_cluster_test_with_node_failure
diff --git a/cpp/src/tests/federated_topic_test b/qpid/cpp/src/tests/federated_topic_test
similarity index 100%
rename from cpp/src/tests/federated_topic_test
rename to qpid/cpp/src/tests/federated_topic_test
diff --git a/cpp/src/tests/federation.py b/qpid/cpp/src/tests/federation.py
similarity index 100%
rename from cpp/src/tests/federation.py
rename to qpid/cpp/src/tests/federation.py
diff --git a/cpp/src/tests/find_prog.ps1 b/qpid/cpp/src/tests/find_prog.ps1
similarity index 100%
rename from cpp/src/tests/find_prog.ps1
rename to qpid/cpp/src/tests/find_prog.ps1
diff --git a/cpp/src/tests/header_test.cpp b/qpid/cpp/src/tests/header_test.cpp
similarity index 100%
rename from cpp/src/tests/header_test.cpp
rename to qpid/cpp/src/tests/header_test.cpp
diff --git a/cpp/src/tests/header_test.py b/qpid/cpp/src/tests/header_test.py
similarity index 100%
rename from cpp/src/tests/header_test.py
rename to qpid/cpp/src/tests/header_test.py
diff --git a/cpp/src/tests/headers_federation.py b/qpid/cpp/src/tests/headers_federation.py
similarity index 100%
rename from cpp/src/tests/headers_federation.py
rename to qpid/cpp/src/tests/headers_federation.py
diff --git a/cpp/src/tests/install_env.sh.in b/qpid/cpp/src/tests/install_env.sh.in
similarity index 100%
rename from cpp/src/tests/install_env.sh.in
rename to qpid/cpp/src/tests/install_env.sh.in
diff --git a/cpp/src/tests/logging.cpp b/qpid/cpp/src/tests/logging.cpp
similarity index 100%
rename from cpp/src/tests/logging.cpp
rename to qpid/cpp/src/tests/logging.cpp
diff --git a/cpp/src/tests/long_cluster_tests.py b/qpid/cpp/src/tests/long_cluster_tests.py
similarity index 100%
rename from cpp/src/tests/long_cluster_tests.py
rename to qpid/cpp/src/tests/long_cluster_tests.py
diff --git a/cpp/src/tests/multiq_perftest b/qpid/cpp/src/tests/multiq_perftest
similarity index 100%
rename from cpp/src/tests/multiq_perftest
rename to qpid/cpp/src/tests/multiq_perftest
diff --git a/cpp/src/tests/perfdist b/qpid/cpp/src/tests/perfdist
similarity index 100%
rename from cpp/src/tests/perfdist
rename to qpid/cpp/src/tests/perfdist
diff --git a/cpp/src/tests/policy.acl b/qpid/cpp/src/tests/policy.acl
similarity index 100%
rename from cpp/src/tests/policy.acl
rename to qpid/cpp/src/tests/policy.acl
diff --git a/cpp/src/tests/publish.cpp b/qpid/cpp/src/tests/publish.cpp
similarity index 100%
rename from cpp/src/tests/publish.cpp
rename to qpid/cpp/src/tests/publish.cpp
diff --git a/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
similarity index 100%
rename from cpp/src/tests/python_tests
rename to qpid/cpp/src/tests/python_tests
diff --git a/cpp/src/tests/python_tests.ps1 b/qpid/cpp/src/tests/python_tests.ps1
similarity index 100%
rename from cpp/src/tests/python_tests.ps1
rename to qpid/cpp/src/tests/python_tests.ps1
diff --git a/cpp/src/tests/qpid-build-rinstall b/qpid/cpp/src/tests/qpid-build-rinstall
similarity index 100%
rename from cpp/src/tests/qpid-build-rinstall
rename to qpid/cpp/src/tests/qpid-build-rinstall
diff --git a/cpp/src/tests/qpid-client-test.cpp b/qpid/cpp/src/tests/qpid-client-test.cpp
similarity index 100%
rename from cpp/src/tests/qpid-client-test.cpp
rename to qpid/cpp/src/tests/qpid-client-test.cpp
diff --git a/cpp/src/tests/qpid-cluster-benchmark b/qpid/cpp/src/tests/qpid-cluster-benchmark
similarity index 100%
rename from cpp/src/tests/qpid-cluster-benchmark
rename to qpid/cpp/src/tests/qpid-cluster-benchmark
diff --git a/cpp/src/tests/qpid-cluster-lag.py b/qpid/cpp/src/tests/qpid-cluster-lag.py
similarity index 100%
rename from cpp/src/tests/qpid-cluster-lag.py
rename to qpid/cpp/src/tests/qpid-cluster-lag.py
diff --git a/cpp/src/tests/qpid-cpp-benchmark b/qpid/cpp/src/tests/qpid-cpp-benchmark
similarity index 100%
rename from cpp/src/tests/qpid-cpp-benchmark
rename to qpid/cpp/src/tests/qpid-cpp-benchmark
diff --git a/cpp/src/tests/qpid-ctrl b/qpid/cpp/src/tests/qpid-ctrl
similarity index 100%
rename from cpp/src/tests/qpid-ctrl
rename to qpid/cpp/src/tests/qpid-ctrl
diff --git a/cpp/src/tests/qpid-latency-test.cpp b/qpid/cpp/src/tests/qpid-latency-test.cpp
similarity index 100%
rename from cpp/src/tests/qpid-latency-test.cpp
rename to qpid/cpp/src/tests/qpid-latency-test.cpp
diff --git a/cpp/src/tests/qpid-perftest.cpp b/qpid/cpp/src/tests/qpid-perftest.cpp
similarity index 100%
rename from cpp/src/tests/qpid-perftest.cpp
rename to qpid/cpp/src/tests/qpid-perftest.cpp
diff --git a/cpp/src/tests/qpid-ping.cpp b/qpid/cpp/src/tests/qpid-ping.cpp
similarity index 100%
rename from cpp/src/tests/qpid-ping.cpp
rename to qpid/cpp/src/tests/qpid-ping.cpp
diff --git a/cpp/src/tests/qpid-receive.cpp b/qpid/cpp/src/tests/qpid-receive.cpp
similarity index 100%
rename from cpp/src/tests/qpid-receive.cpp
rename to qpid/cpp/src/tests/qpid-receive.cpp
diff --git a/cpp/src/tests/qpid-send.cpp b/qpid/cpp/src/tests/qpid-send.cpp
similarity index 100%
rename from cpp/src/tests/qpid-send.cpp
rename to qpid/cpp/src/tests/qpid-send.cpp
diff --git a/cpp/src/tests/qpid-src-rinstall b/qpid/cpp/src/tests/qpid-src-rinstall
similarity index 100%
rename from cpp/src/tests/qpid-src-rinstall
rename to qpid/cpp/src/tests/qpid-src-rinstall
diff --git a/cpp/src/tests/qpid-stream.cpp b/qpid/cpp/src/tests/qpid-stream.cpp
similarity index 100%
rename from cpp/src/tests/qpid-stream.cpp
rename to qpid/cpp/src/tests/qpid-stream.cpp
diff --git a/cpp/src/tests/qpid-test-cluster b/qpid/cpp/src/tests/qpid-test-cluster
similarity index 100%
rename from cpp/src/tests/qpid-test-cluster
rename to qpid/cpp/src/tests/qpid-test-cluster
diff --git a/cpp/src/tests/qpid-topic-listener.cpp b/qpid/cpp/src/tests/qpid-topic-listener.cpp
similarity index 100%
rename from cpp/src/tests/qpid-topic-listener.cpp
rename to qpid/cpp/src/tests/qpid-topic-listener.cpp
diff --git a/cpp/src/tests/qpid-topic-publisher.cpp b/qpid/cpp/src/tests/qpid-topic-publisher.cpp
similarity index 100%
rename from cpp/src/tests/qpid-topic-publisher.cpp
rename to qpid/cpp/src/tests/qpid-topic-publisher.cpp
diff --git a/cpp/src/tests/qpid-txtest.cpp b/qpid/cpp/src/tests/qpid-txtest.cpp
similarity index 100%
rename from cpp/src/tests/qpid-txtest.cpp
rename to qpid/cpp/src/tests/qpid-txtest.cpp
diff --git a/cpp/src/tests/queue_flow_limit_tests.py b/qpid/cpp/src/tests/queue_flow_limit_tests.py
similarity index 100%
rename from cpp/src/tests/queue_flow_limit_tests.py
rename to qpid/cpp/src/tests/queue_flow_limit_tests.py
diff --git a/cpp/src/tests/quick_perftest b/qpid/cpp/src/tests/quick_perftest
similarity index 100%
rename from cpp/src/tests/quick_perftest
rename to qpid/cpp/src/tests/quick_perftest
diff --git a/cpp/src/tests/quick_topictest b/qpid/cpp/src/tests/quick_topictest
similarity index 100%
rename from cpp/src/tests/quick_topictest
rename to qpid/cpp/src/tests/quick_topictest
diff --git a/cpp/src/tests/quick_topictest.ps1 b/qpid/cpp/src/tests/quick_topictest.ps1
similarity index 100%
rename from cpp/src/tests/quick_topictest.ps1
rename to qpid/cpp/src/tests/quick_topictest.ps1
diff --git a/cpp/src/tests/quick_txtest b/qpid/cpp/src/tests/quick_txtest
similarity index 100%
rename from cpp/src/tests/quick_txtest
rename to qpid/cpp/src/tests/quick_txtest
diff --git a/cpp/src/tests/receiver.cpp b/qpid/cpp/src/tests/receiver.cpp
similarity index 100%
rename from cpp/src/tests/receiver.cpp
rename to qpid/cpp/src/tests/receiver.cpp
diff --git a/cpp/src/tests/reliable_replication_test b/qpid/cpp/src/tests/reliable_replication_test
similarity index 100%
rename from cpp/src/tests/reliable_replication_test
rename to qpid/cpp/src/tests/reliable_replication_test
diff --git a/cpp/src/tests/replaying_sender.cpp b/qpid/cpp/src/tests/replaying_sender.cpp
similarity index 100%
rename from cpp/src/tests/replaying_sender.cpp
rename to qpid/cpp/src/tests/replaying_sender.cpp
diff --git a/cpp/src/tests/replication_test b/qpid/cpp/src/tests/replication_test
similarity index 100%
rename from cpp/src/tests/replication_test
rename to qpid/cpp/src/tests/replication_test
diff --git a/cpp/src/tests/restart_cluster b/qpid/cpp/src/tests/restart_cluster
similarity index 100%
rename from cpp/src/tests/restart_cluster
rename to qpid/cpp/src/tests/restart_cluster
diff --git a/cpp/src/tests/resuming_receiver.cpp b/qpid/cpp/src/tests/resuming_receiver.cpp
similarity index 100%
rename from cpp/src/tests/resuming_receiver.cpp
rename to qpid/cpp/src/tests/resuming_receiver.cpp
diff --git a/cpp/src/tests/ring_queue_test b/qpid/cpp/src/tests/ring_queue_test
similarity index 100%
rename from cpp/src/tests/ring_queue_test
rename to qpid/cpp/src/tests/ring_queue_test
diff --git a/cpp/src/tests/rsynchosts b/qpid/cpp/src/tests/rsynchosts
similarity index 100%
rename from cpp/src/tests/rsynchosts
rename to qpid/cpp/src/tests/rsynchosts
diff --git a/cpp/src/tests/run-unit-tests b/qpid/cpp/src/tests/run-unit-tests
similarity index 100%
rename from cpp/src/tests/run-unit-tests
rename to qpid/cpp/src/tests/run-unit-tests
diff --git a/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
similarity index 100%
rename from cpp/src/tests/run_acl_tests
rename to qpid/cpp/src/tests/run_acl_tests
diff --git a/cpp/src/tests/run_acl_tests.ps1 b/qpid/cpp/src/tests/run_acl_tests.ps1
similarity index 100%
rename from cpp/src/tests/run_acl_tests.ps1
rename to qpid/cpp/src/tests/run_acl_tests.ps1
diff --git a/cpp/src/tests/run_cli_tests b/qpid/cpp/src/tests/run_cli_tests
similarity index 100%
rename from cpp/src/tests/run_cli_tests
rename to qpid/cpp/src/tests/run_cli_tests
diff --git a/cpp/src/tests/run_cluster_authentication_soak b/qpid/cpp/src/tests/run_cluster_authentication_soak
similarity index 100%
rename from cpp/src/tests/run_cluster_authentication_soak
rename to qpid/cpp/src/tests/run_cluster_authentication_soak
diff --git a/cpp/src/tests/run_cluster_authentication_test b/qpid/cpp/src/tests/run_cluster_authentication_test
similarity index 100%
rename from cpp/src/tests/run_cluster_authentication_test
rename to qpid/cpp/src/tests/run_cluster_authentication_test
diff --git a/cpp/src/tests/run_cluster_test b/qpid/cpp/src/tests/run_cluster_test
similarity index 100%
rename from cpp/src/tests/run_cluster_test
rename to qpid/cpp/src/tests/run_cluster_test
diff --git a/cpp/src/tests/run_cluster_tests b/qpid/cpp/src/tests/run_cluster_tests
similarity index 100%
rename from cpp/src/tests/run_cluster_tests
rename to qpid/cpp/src/tests/run_cluster_tests
diff --git a/cpp/src/tests/run_failover_soak b/qpid/cpp/src/tests/run_failover_soak
similarity index 100%
rename from cpp/src/tests/run_failover_soak
rename to qpid/cpp/src/tests/run_failover_soak
diff --git a/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests
similarity index 100%
rename from cpp/src/tests/run_federation_tests
rename to qpid/cpp/src/tests/run_federation_tests
diff --git a/cpp/src/tests/run_federation_tests.ps1 b/qpid/cpp/src/tests/run_federation_tests.ps1
similarity index 100%
rename from cpp/src/tests/run_federation_tests.ps1
rename to qpid/cpp/src/tests/run_federation_tests.ps1
diff --git a/cpp/src/tests/run_header_test b/qpid/cpp/src/tests/run_header_test
similarity index 100%
rename from cpp/src/tests/run_header_test
rename to qpid/cpp/src/tests/run_header_test
diff --git a/cpp/src/tests/run_header_test.ps1 b/qpid/cpp/src/tests/run_header_test.ps1
similarity index 100%
rename from cpp/src/tests/run_header_test.ps1
rename to qpid/cpp/src/tests/run_header_test.ps1
diff --git a/cpp/src/tests/run_headers_federation_tests b/qpid/cpp/src/tests/run_headers_federation_tests
similarity index 100%
rename from cpp/src/tests/run_headers_federation_tests
rename to qpid/cpp/src/tests/run_headers_federation_tests
diff --git a/cpp/src/tests/run_long_cluster_tests b/qpid/cpp/src/tests/run_long_cluster_tests
similarity index 100%
rename from cpp/src/tests/run_long_cluster_tests
rename to qpid/cpp/src/tests/run_long_cluster_tests
diff --git a/cpp/src/tests/run_perftest b/qpid/cpp/src/tests/run_perftest
similarity index 100%
rename from cpp/src/tests/run_perftest
rename to qpid/cpp/src/tests/run_perftest
diff --git a/cpp/src/tests/run_queue_flow_limit_tests b/qpid/cpp/src/tests/run_queue_flow_limit_tests
similarity index 100%
rename from cpp/src/tests/run_queue_flow_limit_tests
rename to qpid/cpp/src/tests/run_queue_flow_limit_tests
diff --git a/cpp/src/tests/run_ring_queue_test b/qpid/cpp/src/tests/run_ring_queue_test
similarity index 100%
rename from cpp/src/tests/run_ring_queue_test
rename to qpid/cpp/src/tests/run_ring_queue_test
diff --git a/cpp/src/tests/run_store_tests.ps1 b/qpid/cpp/src/tests/run_store_tests.ps1
similarity index 100%
rename from cpp/src/tests/run_store_tests.ps1
rename to qpid/cpp/src/tests/run_store_tests.ps1
diff --git a/cpp/src/tests/run_test b/qpid/cpp/src/tests/run_test
similarity index 100%
rename from cpp/src/tests/run_test
rename to qpid/cpp/src/tests/run_test
diff --git a/cpp/src/tests/run_test.ps1 b/qpid/cpp/src/tests/run_test.ps1
similarity index 100%
rename from cpp/src/tests/run_test.ps1
rename to qpid/cpp/src/tests/run_test.ps1
diff --git a/cpp/src/tests/sasl.mk b/qpid/cpp/src/tests/sasl.mk
similarity index 100%
rename from cpp/src/tests/sasl.mk
rename to qpid/cpp/src/tests/sasl.mk
diff --git a/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
similarity index 100%
rename from cpp/src/tests/sasl_fed
rename to qpid/cpp/src/tests/sasl_fed
diff --git a/cpp/src/tests/sasl_fed_ex b/qpid/cpp/src/tests/sasl_fed_ex
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex
rename to qpid/cpp/src/tests/sasl_fed_ex
diff --git a/cpp/src/tests/sasl_fed_ex_dynamic b/qpid/cpp/src/tests/sasl_fed_ex_dynamic
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_dynamic
rename to qpid/cpp/src/tests/sasl_fed_ex_dynamic
diff --git a/cpp/src/tests/sasl_fed_ex_dynamic_cluster b/qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_dynamic_cluster
rename to qpid/cpp/src/tests/sasl_fed_ex_dynamic_cluster
diff --git a/cpp/src/tests/sasl_fed_ex_link b/qpid/cpp/src/tests/sasl_fed_ex_link
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_link
rename to qpid/cpp/src/tests/sasl_fed_ex_link
diff --git a/cpp/src/tests/sasl_fed_ex_link_cluster b/qpid/cpp/src/tests/sasl_fed_ex_link_cluster
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_link_cluster
rename to qpid/cpp/src/tests/sasl_fed_ex_link_cluster
diff --git a/cpp/src/tests/sasl_fed_ex_queue b/qpid/cpp/src/tests/sasl_fed_ex_queue
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_queue
rename to qpid/cpp/src/tests/sasl_fed_ex_queue
diff --git a/cpp/src/tests/sasl_fed_ex_queue_cluster b/qpid/cpp/src/tests/sasl_fed_ex_queue_cluster
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_queue_cluster
rename to qpid/cpp/src/tests/sasl_fed_ex_queue_cluster
diff --git a/cpp/src/tests/sasl_fed_ex_route b/qpid/cpp/src/tests/sasl_fed_ex_route
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_route
rename to qpid/cpp/src/tests/sasl_fed_ex_route
diff --git a/cpp/src/tests/sasl_fed_ex_route_cluster b/qpid/cpp/src/tests/sasl_fed_ex_route_cluster
similarity index 100%
rename from cpp/src/tests/sasl_fed_ex_route_cluster
rename to qpid/cpp/src/tests/sasl_fed_ex_route_cluster
diff --git a/cpp/src/tests/sasl_test_setup.sh b/qpid/cpp/src/tests/sasl_test_setup.sh
similarity index 100%
rename from cpp/src/tests/sasl_test_setup.sh
rename to qpid/cpp/src/tests/sasl_test_setup.sh
diff --git a/cpp/src/tests/sasl_version.cpp b/qpid/cpp/src/tests/sasl_version.cpp
similarity index 100%
rename from cpp/src/tests/sasl_version.cpp
rename to qpid/cpp/src/tests/sasl_version.cpp
diff --git a/cpp/src/tests/sender.cpp b/qpid/cpp/src/tests/sender.cpp
similarity index 100%
rename from cpp/src/tests/sender.cpp
rename to qpid/cpp/src/tests/sender.cpp
diff --git a/cpp/src/tests/shared_perftest b/qpid/cpp/src/tests/shared_perftest
similarity index 100%
rename from cpp/src/tests/shared_perftest
rename to qpid/cpp/src/tests/shared_perftest
diff --git a/cpp/src/tests/shlibtest.cpp b/qpid/cpp/src/tests/shlibtest.cpp
similarity index 100%
rename from cpp/src/tests/shlibtest.cpp
rename to qpid/cpp/src/tests/shlibtest.cpp
diff --git a/cpp/src/tests/ssl.mk b/qpid/cpp/src/tests/ssl.mk
similarity index 100%
rename from cpp/src/tests/ssl.mk
rename to qpid/cpp/src/tests/ssl.mk
diff --git a/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test
similarity index 100%
rename from cpp/src/tests/ssl_test
rename to qpid/cpp/src/tests/ssl_test
diff --git a/cpp/src/tests/start_broker b/qpid/cpp/src/tests/start_broker
similarity index 100%
rename from cpp/src/tests/start_broker
rename to qpid/cpp/src/tests/start_broker
diff --git a/cpp/src/tests/start_broker.ps1 b/qpid/cpp/src/tests/start_broker.ps1
similarity index 100%
rename from cpp/src/tests/start_broker.ps1
rename to qpid/cpp/src/tests/start_broker.ps1
diff --git a/cpp/src/tests/start_cluster b/qpid/cpp/src/tests/start_cluster
similarity index 100%
rename from cpp/src/tests/start_cluster
rename to qpid/cpp/src/tests/start_cluster
diff --git a/cpp/src/tests/start_cluster_hosts b/qpid/cpp/src/tests/start_cluster_hosts
similarity index 100%
rename from cpp/src/tests/start_cluster_hosts
rename to qpid/cpp/src/tests/start_cluster_hosts
diff --git a/cpp/src/tests/stop_broker b/qpid/cpp/src/tests/stop_broker
similarity index 100%
rename from cpp/src/tests/stop_broker
rename to qpid/cpp/src/tests/stop_broker
diff --git a/cpp/src/tests/stop_broker.ps1 b/qpid/cpp/src/tests/stop_broker.ps1
similarity index 100%
rename from cpp/src/tests/stop_broker.ps1
rename to qpid/cpp/src/tests/stop_broker.ps1
diff --git a/cpp/src/tests/stop_cluster b/qpid/cpp/src/tests/stop_cluster
similarity index 100%
rename from cpp/src/tests/stop_cluster
rename to qpid/cpp/src/tests/stop_cluster
diff --git a/cpp/src/tests/store.py b/qpid/cpp/src/tests/store.py
similarity index 100%
rename from cpp/src/tests/store.py
rename to qpid/cpp/src/tests/store.py
diff --git a/cpp/src/tests/test.xquery b/qpid/cpp/src/tests/test.xquery
similarity index 100%
rename from cpp/src/tests/test.xquery
rename to qpid/cpp/src/tests/test.xquery
diff --git a/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in
similarity index 100%
rename from cpp/src/tests/test_env.sh.in
rename to qpid/cpp/src/tests/test_env.sh.in
diff --git a/cpp/src/tests/test_store.cpp b/qpid/cpp/src/tests/test_store.cpp
similarity index 100%
rename from cpp/src/tests/test_store.cpp
rename to qpid/cpp/src/tests/test_store.cpp
diff --git a/cpp/src/tests/test_tools.h b/qpid/cpp/src/tests/test_tools.h
similarity index 100%
rename from cpp/src/tests/test_tools.h
rename to qpid/cpp/src/tests/test_tools.h
diff --git a/cpp/src/tests/test_watchdog b/qpid/cpp/src/tests/test_watchdog
similarity index 100%
rename from cpp/src/tests/test_watchdog
rename to qpid/cpp/src/tests/test_watchdog
diff --git a/cpp/src/tests/test_wrap b/qpid/cpp/src/tests/test_wrap
similarity index 100%
rename from cpp/src/tests/test_wrap
rename to qpid/cpp/src/tests/test_wrap
diff --git a/cpp/src/tests/testagent.cpp b/qpid/cpp/src/tests/testagent.cpp
similarity index 100%
rename from cpp/src/tests/testagent.cpp
rename to qpid/cpp/src/tests/testagent.cpp
diff --git a/cpp/src/tests/testagent.mk b/qpid/cpp/src/tests/testagent.mk
similarity index 100%
rename from cpp/src/tests/testagent.mk
rename to qpid/cpp/src/tests/testagent.mk
diff --git a/cpp/src/tests/testagent.xml b/qpid/cpp/src/tests/testagent.xml
similarity index 100%
rename from cpp/src/tests/testagent.xml
rename to qpid/cpp/src/tests/testagent.xml
diff --git a/cpp/src/tests/testlib.py b/qpid/cpp/src/tests/testlib.py
similarity index 100%
rename from cpp/src/tests/testlib.py
rename to qpid/cpp/src/tests/testlib.py
diff --git a/cpp/src/tests/topic_perftest b/qpid/cpp/src/tests/topic_perftest
similarity index 100%
rename from cpp/src/tests/topic_perftest
rename to qpid/cpp/src/tests/topic_perftest
diff --git a/cpp/src/tests/topictest b/qpid/cpp/src/tests/topictest
similarity index 100%
rename from cpp/src/tests/topictest
rename to qpid/cpp/src/tests/topictest
diff --git a/cpp/src/tests/topictest.ps1 b/qpid/cpp/src/tests/topictest.ps1
similarity index 100%
rename from cpp/src/tests/topictest.ps1
rename to qpid/cpp/src/tests/topictest.ps1
diff --git a/cpp/src/tests/txjob.cpp b/qpid/cpp/src/tests/txjob.cpp
similarity index 100%
rename from cpp/src/tests/txjob.cpp
rename to qpid/cpp/src/tests/txjob.cpp
diff --git a/cpp/src/tests/txshift.cpp b/qpid/cpp/src/tests/txshift.cpp
similarity index 100%
rename from cpp/src/tests/txshift.cpp
rename to qpid/cpp/src/tests/txshift.cpp
diff --git a/cpp/src/tests/unit_test.cpp b/qpid/cpp/src/tests/unit_test.cpp
similarity index 100%
rename from cpp/src/tests/unit_test.cpp
rename to qpid/cpp/src/tests/unit_test.cpp
diff --git a/cpp/src/tests/unit_test.h b/qpid/cpp/src/tests/unit_test.h
similarity index 100%
rename from cpp/src/tests/unit_test.h
rename to qpid/cpp/src/tests/unit_test.h
diff --git a/cpp/src/tests/verify_cluster_objects b/qpid/cpp/src/tests/verify_cluster_objects
similarity index 100%
rename from cpp/src/tests/verify_cluster_objects
rename to qpid/cpp/src/tests/verify_cluster_objects
diff --git a/cpp/src/tests/vg_check b/qpid/cpp/src/tests/vg_check
similarity index 100%
rename from cpp/src/tests/vg_check
rename to qpid/cpp/src/tests/vg_check
diff --git a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp b/qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
similarity index 100%
rename from cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
rename to qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
diff --git a/cpp/src/windows/QpiddBroker.cpp b/qpid/cpp/src/windows/QpiddBroker.cpp
similarity index 100%
rename from cpp/src/windows/QpiddBroker.cpp
rename to qpid/cpp/src/windows/QpiddBroker.cpp
diff --git a/cpp/src/windows/resources/qpid-icon.ico b/qpid/cpp/src/windows/resources/qpid-icon.ico
similarity index 100%
rename from cpp/src/windows/resources/qpid-icon.ico
rename to qpid/cpp/src/windows/resources/qpid-icon.ico
Binary files differ
diff --git a/cpp/src/windows/resources/template-resource.rc b/qpid/cpp/src/windows/resources/template-resource.rc
similarity index 100%
rename from cpp/src/windows/resources/template-resource.rc
rename to qpid/cpp/src/windows/resources/template-resource.rc
diff --git a/cpp/src/windows/resources/version-resource.h b/qpid/cpp/src/windows/resources/version-resource.h
similarity index 100%
rename from cpp/src/windows/resources/version-resource.h
rename to qpid/cpp/src/windows/resources/version-resource.h
diff --git a/cpp/src/xml.mk b/qpid/cpp/src/xml.mk
similarity index 100%
rename from cpp/src/xml.mk
rename to qpid/cpp/src/xml.mk
diff --git a/cpp/versions b/qpid/cpp/versions
similarity index 100%
rename from cpp/versions
rename to qpid/cpp/versions
diff --git a/cpp/xml/cluster.xml b/qpid/cpp/xml/cluster.xml
similarity index 100%
rename from cpp/xml/cluster.xml
rename to qpid/cpp/xml/cluster.xml
diff --git a/cpp/xml/extra.xml b/qpid/cpp/xml/extra.xml
similarity index 100%
rename from cpp/xml/extra.xml
rename to qpid/cpp/xml/extra.xml
diff --git a/doc/book/.gitignore b/qpid/doc/book/.gitignore
similarity index 100%
rename from doc/book/.gitignore
rename to qpid/doc/book/.gitignore
diff --git a/doc/book/Makefile b/qpid/doc/book/Makefile
similarity index 100%
rename from doc/book/Makefile
rename to qpid/doc/book/Makefile
diff --git a/doc/book/README.txt b/qpid/doc/book/README.txt
similarity index 100%
rename from doc/book/README.txt
rename to qpid/doc/book/README.txt
diff --git a/doc/book/build-book.sh b/qpid/doc/book/build-book.sh
similarity index 100%
rename from doc/book/build-book.sh
rename to qpid/doc/book/build-book.sh
diff --git a/doc/book/build-chapter.sh b/qpid/doc/book/build-chapter.sh
similarity index 100%
rename from doc/book/build-chapter.sh
rename to qpid/doc/book/build-chapter.sh
diff --git a/doc/book/build.sh b/qpid/doc/book/build.sh
similarity index 100%
rename from doc/book/build.sh
rename to qpid/doc/book/build.sh
diff --git a/doc/book/build.xml b/qpid/doc/book/build.xml
similarity index 100%
rename from doc/book/build.xml
rename to qpid/doc/book/build.xml
diff --git a/doc/book/src/ACL.xml b/qpid/doc/book/src/ACL.xml
similarity index 100%
rename from doc/book/src/ACL.xml
rename to qpid/doc/book/src/ACL.xml
diff --git a/doc/book/src/AMQP-.NET-Messaging-Client.xml b/qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
similarity index 100%
rename from doc/book/src/AMQP-.NET-Messaging-Client.xml
rename to qpid/doc/book/src/AMQP-.NET-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-C++-Messaging-Client.xml b/qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
similarity index 100%
rename from doc/book/src/AMQP-C++-Messaging-Client.xml
rename to qpid/doc/book/src/AMQP-C++-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-Compatibility.xml b/qpid/doc/book/src/AMQP-Compatibility.xml
similarity index 100%
rename from doc/book/src/AMQP-Compatibility.xml
rename to qpid/doc/book/src/AMQP-Compatibility.xml
diff --git a/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml b/qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
similarity index 100%
rename from doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
rename to qpid/doc/book/src/AMQP-Java-JMS-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
similarity index 100%
rename from doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
rename to qpid/doc/book/src/AMQP-Messaging-Broker-CPP-Book.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-CPP.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
similarity index 100%
rename from doc/book/src/AMQP-Messaging-Broker-CPP.xml
rename to qpid/doc/book/src/AMQP-Messaging-Broker-CPP.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
similarity index 100%
rename from doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
rename to qpid/doc/book/src/AMQP-Messaging-Broker-Java-Book.xml
diff --git a/doc/book/src/AMQP-Messaging-Broker-Java.xml b/qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
similarity index 100%
rename from doc/book/src/AMQP-Messaging-Broker-Java.xml
rename to qpid/doc/book/src/AMQP-Messaging-Broker-Java.xml
diff --git a/doc/book/src/AMQP-Python-Messaging-Client.xml b/qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
similarity index 100%
rename from doc/book/src/AMQP-Python-Messaging-Client.xml
rename to qpid/doc/book/src/AMQP-Python-Messaging-Client.xml
diff --git a/doc/book/src/AMQP-Ruby-Messaging-Client.xml b/qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
similarity index 100%
rename from doc/book/src/AMQP-Ruby-Messaging-Client.xml
rename to qpid/doc/book/src/AMQP-Ruby-Messaging-Client.xml
diff --git a/doc/book/src/AMQP.xml b/qpid/doc/book/src/AMQP.xml
similarity index 100%
rename from doc/book/src/AMQP.xml
rename to qpid/doc/book/src/AMQP.xml
diff --git a/doc/book/src/Add-New-Users.xml b/qpid/doc/book/src/Add-New-Users.xml
similarity index 100%
rename from doc/book/src/Add-New-Users.xml
rename to qpid/doc/book/src/Add-New-Users.xml
diff --git a/doc/book/src/Binding-URL-Format.xml b/qpid/doc/book/src/Binding-URL-Format.xml
similarity index 100%
rename from doc/book/src/Binding-URL-Format.xml
rename to qpid/doc/book/src/Binding-URL-Format.xml
diff --git a/doc/book/src/Book-Info.xml b/qpid/doc/book/src/Book-Info.xml
similarity index 100%
rename from doc/book/src/Book-Info.xml
rename to qpid/doc/book/src/Book-Info.xml
diff --git a/doc/book/src/Book.xml b/qpid/doc/book/src/Book.xml
similarity index 100%
rename from doc/book/src/Book.xml
rename to qpid/doc/book/src/Book.xml
diff --git a/doc/book/src/Broker-CPP.xml b/qpid/doc/book/src/Broker-CPP.xml
similarity index 100%
rename from doc/book/src/Broker-CPP.xml
rename to qpid/doc/book/src/Broker-CPP.xml
diff --git a/doc/book/src/Broker-Configuration-Guide.xml b/qpid/doc/book/src/Broker-Configuration-Guide.xml
similarity index 100%
rename from doc/book/src/Broker-Configuration-Guide.xml
rename to qpid/doc/book/src/Broker-Configuration-Guide.xml
diff --git a/doc/book/src/Broker-Java.xml b/qpid/doc/book/src/Broker-Java.xml
similarity index 100%
rename from doc/book/src/Broker-Java.xml
rename to qpid/doc/book/src/Broker-Java.xml
diff --git a/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml b/qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
similarity index 100%
rename from doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
rename to qpid/doc/book/src/Cheat-Sheet-for-configuring-Exchange-Options.xml
diff --git a/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml b/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
similarity index 100%
rename from doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
rename to qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
diff --git a/doc/book/src/Clients.xml b/qpid/doc/book/src/Clients.xml
similarity index 100%
rename from doc/book/src/Clients.xml
rename to qpid/doc/book/src/Clients.xml
diff --git a/doc/book/src/Configure-ACLs.xml b/qpid/doc/book/src/Configure-ACLs.xml
similarity index 100%
rename from doc/book/src/Configure-ACLs.xml
rename to qpid/doc/book/src/Configure-ACLs.xml
diff --git a/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml b/qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
similarity index 100%
rename from doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
rename to qpid/doc/book/src/Configure-Java-Qpid-to-use-a-SSL-connection.xml
diff --git a/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml b/qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
similarity index 100%
rename from doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
rename to qpid/doc/book/src/Configure-Log4j-CompositeRolling-Appender.xml
diff --git a/doc/book/src/Configure-the-Broker-via-config.xml.xml b/qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
similarity index 100%
rename from doc/book/src/Configure-the-Broker-via-config.xml.xml
rename to qpid/doc/book/src/Configure-the-Broker-via-config.xml.xml
diff --git a/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml b/qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
similarity index 100%
rename from doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
rename to qpid/doc/book/src/Configure-the-Virtual-Hosts-via-virtualhosts.xml.xml
diff --git a/doc/book/src/Configuring-Management-Users.xml b/qpid/doc/book/src/Configuring-Management-Users.xml
similarity index 100%
rename from doc/book/src/Configuring-Management-Users.xml
rename to qpid/doc/book/src/Configuring-Management-Users.xml
diff --git a/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml b/qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
similarity index 100%
rename from doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
rename to qpid/doc/book/src/Configuring-Qpid-JMX-Management-Console.xml
diff --git a/doc/book/src/Connection-URL-Format.xml b/qpid/doc/book/src/Connection-URL-Format.xml
similarity index 100%
rename from doc/book/src/Connection-URL-Format.xml
rename to qpid/doc/book/src/Connection-URL-Format.xml
diff --git a/doc/book/src/Debug-using-log4j.xml b/qpid/doc/book/src/Debug-using-log4j.xml
similarity index 100%
rename from doc/book/src/Debug-using-log4j.xml
rename to qpid/doc/book/src/Debug-using-log4j.xml
diff --git a/doc/book/src/Download.xml b/qpid/doc/book/src/Download.xml
similarity index 100%
rename from doc/book/src/Download.xml
rename to qpid/doc/book/src/Download.xml
diff --git a/doc/book/src/Excel-AddIn.xml b/qpid/doc/book/src/Excel-AddIn.xml
similarity index 100%
rename from doc/book/src/Excel-AddIn.xml
rename to qpid/doc/book/src/Excel-AddIn.xml
diff --git a/doc/book/src/FAQ.xml b/qpid/doc/book/src/FAQ.xml
similarity index 100%
rename from doc/book/src/FAQ.xml
rename to qpid/doc/book/src/FAQ.xml
diff --git a/doc/book/src/Getting-Started.xml b/qpid/doc/book/src/Getting-Started.xml
similarity index 100%
rename from doc/book/src/Getting-Started.xml
rename to qpid/doc/book/src/Getting-Started.xml
diff --git a/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml b/qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
similarity index 100%
rename from doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
rename to qpid/doc/book/src/How-to-Tune-M3-Java-Broker-Performance.xml
diff --git a/doc/book/src/How-to-Use-JNDI.xml b/qpid/doc/book/src/How-to-Use-JNDI.xml
similarity index 100%
rename from doc/book/src/How-to-Use-JNDI.xml
rename to qpid/doc/book/src/How-to-Use-JNDI.xml
diff --git a/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml b/qpid/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
similarity index 100%
rename from doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
rename to qpid/doc/book/src/How-to-Use-SlowConsumerDisconnect.xml
diff --git a/doc/book/src/InfoPlugin.xml b/qpid/doc/book/src/InfoPlugin.xml
similarity index 100%
rename from doc/book/src/InfoPlugin.xml
rename to qpid/doc/book/src/InfoPlugin.xml
diff --git a/doc/book/src/Introduction.xml b/qpid/doc/book/src/Introduction.xml
similarity index 100%
rename from doc/book/src/Introduction.xml
rename to qpid/doc/book/src/Introduction.xml
diff --git a/doc/book/src/Java-Broker-Feature-Guide.xml b/qpid/doc/book/src/Java-Broker-Feature-Guide.xml
similarity index 100%
rename from doc/book/src/Java-Broker-Feature-Guide.xml
rename to qpid/doc/book/src/Java-Broker-Feature-Guide.xml
diff --git a/doc/book/src/Java-Broker-StatusLogMessages.xml b/qpid/doc/book/src/Java-Broker-StatusLogMessages.xml
similarity index 100%
rename from doc/book/src/Java-Broker-StatusLogMessages.xml
rename to qpid/doc/book/src/Java-Broker-StatusLogMessages.xml
diff --git a/doc/book/src/Java-Environment-Variables.xml b/qpid/doc/book/src/Java-Environment-Variables.xml
similarity index 100%
rename from doc/book/src/Java-Environment-Variables.xml
rename to qpid/doc/book/src/Java-Environment-Variables.xml
diff --git a/doc/book/src/Java-JMS-Selector-Syntax.xml b/qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
similarity index 100%
rename from doc/book/src/Java-JMS-Selector-Syntax.xml
rename to qpid/doc/book/src/Java-JMS-Selector-Syntax.xml
diff --git a/doc/book/src/LVQ.xml b/qpid/doc/book/src/LVQ.xml
similarity index 100%
rename from doc/book/src/LVQ.xml
rename to qpid/doc/book/src/LVQ.xml
diff --git a/doc/book/src/Management-Console-Security.xml b/qpid/doc/book/src/Management-Console-Security.xml
similarity index 100%
rename from doc/book/src/Management-Console-Security.xml
rename to qpid/doc/book/src/Management-Console-Security.xml
diff --git a/doc/book/src/Management-Design-notes.xml b/qpid/doc/book/src/Management-Design-notes.xml
similarity index 100%
rename from doc/book/src/Management-Design-notes.xml
rename to qpid/doc/book/src/Management-Design-notes.xml
diff --git a/doc/book/src/Managing-CPP-Broker.xml b/qpid/doc/book/src/Managing-CPP-Broker.xml
similarity index 100%
rename from doc/book/src/Managing-CPP-Broker.xml
rename to qpid/doc/book/src/Managing-CPP-Broker.xml
diff --git a/doc/book/src/MessageStore-Tool.xml b/qpid/doc/book/src/MessageStore-Tool.xml
similarity index 100%
rename from doc/book/src/MessageStore-Tool.xml
rename to qpid/doc/book/src/MessageStore-Tool.xml
diff --git a/doc/book/src/NET-User-Guide.xml b/qpid/doc/book/src/NET-User-Guide.xml
similarity index 100%
rename from doc/book/src/NET-User-Guide.xml
rename to qpid/doc/book/src/NET-User-Guide.xml
diff --git a/doc/book/src/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
similarity index 100%
rename from doc/book/src/Programming-In-Apache-Qpid.xml
rename to qpid/doc/book/src/Programming-In-Apache-Qpid.xml
diff --git a/doc/book/src/PythonBrokerTest.xml b/qpid/doc/book/src/PythonBrokerTest.xml
similarity index 100%
rename from doc/book/src/PythonBrokerTest.xml
rename to qpid/doc/book/src/PythonBrokerTest.xml
diff --git a/doc/book/src/QMF-Python-Console-Tutorial.xml b/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
similarity index 100%
rename from doc/book/src/QMF-Python-Console-Tutorial.xml
rename to qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
diff --git a/doc/book/src/QMan-Qpid-Management-bridge.xml b/qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
similarity index 100%
rename from doc/book/src/QMan-Qpid-Management-bridge.xml
rename to qpid/doc/book/src/QMan-Qpid-Management-bridge.xml
diff --git a/doc/book/src/QmfBook.xml b/qpid/doc/book/src/QmfBook.xml
similarity index 100%
rename from doc/book/src/QmfBook.xml
rename to qpid/doc/book/src/QmfBook.xml
diff --git a/doc/book/src/QmfIntroduction.xml b/qpid/doc/book/src/QmfIntroduction.xml
similarity index 100%
rename from doc/book/src/QmfIntroduction.xml
rename to qpid/doc/book/src/QmfIntroduction.xml
diff --git a/doc/book/src/Qpid-ACLs.xml b/qpid/doc/book/src/Qpid-ACLs.xml
similarity index 100%
rename from doc/book/src/Qpid-ACLs.xml
rename to qpid/doc/book/src/Qpid-ACLs.xml
diff --git a/doc/book/src/Qpid-Book.xml b/qpid/doc/book/src/Qpid-Book.xml
similarity index 100%
rename from doc/book/src/Qpid-Book.xml
rename to qpid/doc/book/src/Qpid-Book.xml
diff --git a/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml b/qpid/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
similarity index 100%
rename from doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
rename to qpid/doc/book/src/Qpid-Compatibility-And-Interoperability-Book.xml
diff --git a/doc/book/src/Qpid-Interoperability-Documentation.xml b/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
similarity index 100%
rename from doc/book/src/Qpid-Interoperability-Documentation.xml
rename to qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
diff --git a/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml b/qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
similarity index 100%
rename from doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
rename to qpid/doc/book/src/Qpid-JMX-Management-Console-FAQ.xml
diff --git a/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml b/qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
similarity index 100%
rename from doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
rename to qpid/doc/book/src/Qpid-JMX-Management-Console-User-Guide.xml
diff --git a/doc/book/src/Qpid-JMX-Management-Console.xml b/qpid/doc/book/src/Qpid-JMX-Management-Console.xml
similarity index 100%
rename from doc/book/src/Qpid-JMX-Management-Console.xml
rename to qpid/doc/book/src/Qpid-JMX-Management-Console.xml
diff --git a/doc/book/src/Qpid-Java-Broker-Management-CLI.xml b/qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
similarity index 100%
rename from doc/book/src/Qpid-Java-Broker-Management-CLI.xml
rename to qpid/doc/book/src/Qpid-Java-Broker-Management-CLI.xml
diff --git a/doc/book/src/Qpid-Java-Build-How-To.xml b/qpid/doc/book/src/Qpid-Java-Build-How-To.xml
similarity index 100%
rename from doc/book/src/Qpid-Java-Build-How-To.xml
rename to qpid/doc/book/src/Qpid-Java-Build-How-To.xml
diff --git a/doc/book/src/Qpid-Java-FAQ.xml b/qpid/doc/book/src/Qpid-Java-FAQ.xml
similarity index 100%
rename from doc/book/src/Qpid-Java-FAQ.xml
rename to qpid/doc/book/src/Qpid-Java-FAQ.xml
diff --git a/doc/book/src/Qpid-Management-Features.xml b/qpid/doc/book/src/Qpid-Management-Features.xml
similarity index 100%
rename from doc/book/src/Qpid-Management-Features.xml
rename to qpid/doc/book/src/Qpid-Management-Features.xml
diff --git a/doc/book/src/Qpid-Management-Framework.xml b/qpid/doc/book/src/Qpid-Management-Framework.xml
similarity index 100%
rename from doc/book/src/Qpid-Management-Framework.xml
rename to qpid/doc/book/src/Qpid-Management-Framework.xml
diff --git a/doc/book/src/Qpid-Troubleshooting-Guide.xml b/qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml
similarity index 100%
rename from doc/book/src/Qpid-Troubleshooting-Guide.xml
rename to qpid/doc/book/src/Qpid-Troubleshooting-Guide.xml
diff --git a/doc/book/src/Running-CPP-Broker.xml b/qpid/doc/book/src/Running-CPP-Broker.xml
similarity index 100%
rename from doc/book/src/Running-CPP-Broker.xml
rename to qpid/doc/book/src/Running-CPP-Broker.xml
diff --git a/doc/book/src/SASL-Compatibility.xml b/qpid/doc/book/src/SASL-Compatibility.xml
similarity index 100%
rename from doc/book/src/SASL-Compatibility.xml
rename to qpid/doc/book/src/SASL-Compatibility.xml
diff --git a/doc/book/src/SSL.xml b/qpid/doc/book/src/SSL.xml
similarity index 100%
rename from doc/book/src/SSL.xml
rename to qpid/doc/book/src/SSL.xml
diff --git a/doc/book/src/Security-Plugins.xml b/qpid/doc/book/src/Security-Plugins.xml
similarity index 100%
rename from doc/book/src/Security-Plugins.xml
rename to qpid/doc/book/src/Security-Plugins.xml
diff --git a/doc/book/src/Security.xml b/qpid/doc/book/src/Security.xml
similarity index 100%
rename from doc/book/src/Security.xml
rename to qpid/doc/book/src/Security.xml
diff --git a/doc/book/src/Starting-a-cluster.xml b/qpid/doc/book/src/Starting-a-cluster.xml
similarity index 100%
rename from doc/book/src/Starting-a-cluster.xml
rename to qpid/doc/book/src/Starting-a-cluster.xml
diff --git a/doc/book/src/System-Properties.xml b/qpid/doc/book/src/System-Properties.xml
similarity index 100%
rename from doc/book/src/System-Properties.xml
rename to qpid/doc/book/src/System-Properties.xml
diff --git a/doc/book/src/Use-Priority-Queues.xml b/qpid/doc/book/src/Use-Priority-Queues.xml
similarity index 100%
rename from doc/book/src/Use-Priority-Queues.xml
rename to qpid/doc/book/src/Use-Priority-Queues.xml
diff --git a/doc/book/src/Using-Broker-Federation.xml b/qpid/doc/book/src/Using-Broker-Federation.xml
similarity index 100%
rename from doc/book/src/Using-Broker-Federation.xml
rename to qpid/doc/book/src/Using-Broker-Federation.xml
diff --git a/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml b/qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
similarity index 100%
rename from doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
rename to qpid/doc/book/src/Using-Qpid-with-other-JNDI-Providers.xml
diff --git a/doc/book/src/WCF.xml b/qpid/doc/book/src/WCF.xml
similarity index 100%
rename from doc/book/src/WCF.xml
rename to qpid/doc/book/src/WCF.xml
diff --git a/doc/book/src/amqp-advanced-message-queueing-protocol.html b/qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html
similarity index 100%
rename from doc/book/src/amqp-advanced-message-queueing-protocol.html
rename to qpid/doc/book/src/amqp-advanced-message-queueing-protocol.html
diff --git a/doc/book/src/images/jmx_console/3113098.png b/qpid/doc/book/src/images/jmx_console/3113098.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113098.png
rename to qpid/doc/book/src/images/jmx_console/3113098.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113099.png b/qpid/doc/book/src/images/jmx_console/3113099.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113099.png
rename to qpid/doc/book/src/images/jmx_console/3113099.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113100.png b/qpid/doc/book/src/images/jmx_console/3113100.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113100.png
rename to qpid/doc/book/src/images/jmx_console/3113100.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113101.png b/qpid/doc/book/src/images/jmx_console/3113101.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113101.png
rename to qpid/doc/book/src/images/jmx_console/3113101.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113102.png b/qpid/doc/book/src/images/jmx_console/3113102.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113102.png
rename to qpid/doc/book/src/images/jmx_console/3113102.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113103.png b/qpid/doc/book/src/images/jmx_console/3113103.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113103.png
rename to qpid/doc/book/src/images/jmx_console/3113103.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113104.png b/qpid/doc/book/src/images/jmx_console/3113104.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113104.png
rename to qpid/doc/book/src/images/jmx_console/3113104.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113105.png b/qpid/doc/book/src/images/jmx_console/3113105.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113105.png
rename to qpid/doc/book/src/images/jmx_console/3113105.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113106.png b/qpid/doc/book/src/images/jmx_console/3113106.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113106.png
rename to qpid/doc/book/src/images/jmx_console/3113106.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113107.png b/qpid/doc/book/src/images/jmx_console/3113107.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113107.png
rename to qpid/doc/book/src/images/jmx_console/3113107.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113108.png b/qpid/doc/book/src/images/jmx_console/3113108.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113108.png
rename to qpid/doc/book/src/images/jmx_console/3113108.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113109.png b/qpid/doc/book/src/images/jmx_console/3113109.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113109.png
rename to qpid/doc/book/src/images/jmx_console/3113109.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113110.png b/qpid/doc/book/src/images/jmx_console/3113110.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113110.png
rename to qpid/doc/book/src/images/jmx_console/3113110.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113111.png b/qpid/doc/book/src/images/jmx_console/3113111.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113111.png
rename to qpid/doc/book/src/images/jmx_console/3113111.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113112.png b/qpid/doc/book/src/images/jmx_console/3113112.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113112.png
rename to qpid/doc/book/src/images/jmx_console/3113112.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113113.png b/qpid/doc/book/src/images/jmx_console/3113113.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113113.png
rename to qpid/doc/book/src/images/jmx_console/3113113.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113114.png b/qpid/doc/book/src/images/jmx_console/3113114.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113114.png
rename to qpid/doc/book/src/images/jmx_console/3113114.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113115.png b/qpid/doc/book/src/images/jmx_console/3113115.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113115.png
rename to qpid/doc/book/src/images/jmx_console/3113115.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113116.png b/qpid/doc/book/src/images/jmx_console/3113116.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113116.png
rename to qpid/doc/book/src/images/jmx_console/3113116.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113117.png b/qpid/doc/book/src/images/jmx_console/3113117.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113117.png
rename to qpid/doc/book/src/images/jmx_console/3113117.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113118.png b/qpid/doc/book/src/images/jmx_console/3113118.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113118.png
rename to qpid/doc/book/src/images/jmx_console/3113118.png
Binary files differ
diff --git a/doc/book/src/images/jmx_console/3113119.png b/qpid/doc/book/src/images/jmx_console/3113119.png
similarity index 100%
rename from doc/book/src/images/jmx_console/3113119.png
rename to qpid/doc/book/src/images/jmx_console/3113119.png
Binary files differ
diff --git a/doc/book/src/images/qpid-logo.png b/qpid/doc/book/src/images/qpid-logo.png
similarity index 100%
rename from doc/book/src/images/qpid-logo.png
rename to qpid/doc/book/src/images/qpid-logo.png
Binary files differ
diff --git a/doc/book/src/java/broker/configuration/Topic-Configuration.xml b/qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml
similarity index 100%
rename from doc/book/src/java/broker/configuration/Topic-Configuration.xml
rename to qpid/doc/book/src/java/broker/configuration/Topic-Configuration.xml
diff --git a/doc/book/src/producer-flow-control.xml b/qpid/doc/book/src/producer-flow-control.xml
similarity index 100%
rename from doc/book/src/producer-flow-control.xml
rename to qpid/doc/book/src/producer-flow-control.xml
diff --git a/doc/book/src/queue-state-replication.xml b/qpid/doc/book/src/queue-state-replication.xml
similarity index 100%
rename from doc/book/src/queue-state-replication.xml
rename to qpid/doc/book/src/queue-state-replication.xml
diff --git a/doc/book/src/schemas.xml b/qpid/doc/book/src/schemas.xml
similarity index 100%
rename from doc/book/src/schemas.xml
rename to qpid/doc/book/src/schemas.xml
diff --git a/doc/dev-readme/QPID-Component-README.odg b/qpid/doc/dev-readme/QPID-Component-README.odg
similarity index 100%
rename from doc/dev-readme/QPID-Component-README.odg
rename to qpid/doc/dev-readme/QPID-Component-README.odg
Binary files differ
diff --git a/doc/dev-readme/QPID-Component-README.pdf b/qpid/doc/dev-readme/QPID-Component-README.pdf
similarity index 100%
rename from doc/dev-readme/QPID-Component-README.pdf
rename to qpid/doc/dev-readme/QPID-Component-README.pdf
Binary files differ
diff --git a/doc/dev-readme/README.txt b/qpid/doc/dev-readme/README.txt
similarity index 100%
rename from doc/dev-readme/README.txt
rename to qpid/doc/dev-readme/README.txt
diff --git a/doc/website/README.txt b/qpid/doc/website/README.txt
similarity index 100%
rename from doc/website/README.txt
rename to qpid/doc/website/README.txt
diff --git a/doc/website/build.sh b/qpid/doc/website/build.sh
similarity index 100%
rename from doc/website/build.sh
rename to qpid/doc/website/build.sh
diff --git a/doc/website/content/.htaccess b/qpid/doc/website/content/.htaccess
similarity index 100%
rename from doc/website/content/.htaccess
rename to qpid/doc/website/content/.htaccess
diff --git a/doc/website/content/acknowledgements.html b/qpid/doc/website/content/acknowledgements.html
similarity index 100%
rename from doc/website/content/acknowledgements.html
rename to qpid/doc/website/content/acknowledgements.html
diff --git a/doc/website/content/amqp.html b/qpid/doc/website/content/amqp.html
similarity index 100%
rename from doc/website/content/amqp.html
rename to qpid/doc/website/content/amqp.html
diff --git a/doc/website/content/compatibility.html b/qpid/doc/website/content/compatibility.html
similarity index 100%
rename from doc/website/content/compatibility.html
rename to qpid/doc/website/content/compatibility.html
diff --git a/doc/website/content/documentation.html b/qpid/doc/website/content/documentation.html
similarity index 100%
rename from doc/website/content/documentation.html
rename to qpid/doc/website/content/documentation.html
diff --git a/doc/website/content/download.cgi b/qpid/doc/website/content/download.cgi
similarity index 100%
rename from doc/website/content/download.cgi
rename to qpid/doc/website/content/download.cgi
diff --git a/doc/website/content/download.html b/qpid/doc/website/content/download.html
similarity index 100%
rename from doc/website/content/download.html
rename to qpid/doc/website/content/download.html
diff --git a/doc/website/content/getting_involved.html b/qpid/doc/website/content/getting_involved.html
similarity index 100%
rename from doc/website/content/getting_involved.html
rename to qpid/doc/website/content/getting_involved.html
diff --git a/doc/website/content/getting_started.html b/qpid/doc/website/content/getting_started.html
similarity index 100%
rename from doc/website/content/getting_started.html
rename to qpid/doc/website/content/getting_started.html
diff --git a/doc/website/content/images/README.txt b/qpid/doc/website/content/images/README.txt
similarity index 100%
rename from doc/website/content/images/README.txt
rename to qpid/doc/website/content/images/README.txt
diff --git a/doc/website/content/images/jprofiler.png b/qpid/doc/website/content/images/jprofiler.png
similarity index 100%
rename from doc/website/content/images/jprofiler.png
rename to qpid/doc/website/content/images/jprofiler.png
Binary files differ
diff --git a/doc/website/content/images/structure101.jpg b/qpid/doc/website/content/images/structure101.jpg
similarity index 100%
rename from doc/website/content/images/structure101.jpg
rename to qpid/doc/website/content/images/structure101.jpg
Binary files differ
diff --git a/doc/website/content/index.html b/qpid/doc/website/content/index.html
similarity index 100%
rename from doc/website/content/index.html
rename to qpid/doc/website/content/index.html
diff --git a/doc/website/content/mailing_lists.html b/qpid/doc/website/content/mailing_lists.html
similarity index 100%
rename from doc/website/content/mailing_lists.html
rename to qpid/doc/website/content/mailing_lists.html
diff --git a/doc/website/content/people.html b/qpid/doc/website/content/people.html
similarity index 100%
rename from doc/website/content/people.html
rename to qpid/doc/website/content/people.html
diff --git a/doc/website/content/qpid_integrated_with.html b/qpid/doc/website/content/qpid_integrated_with.html
similarity index 100%
rename from doc/website/content/qpid_integrated_with.html
rename to qpid/doc/website/content/qpid_integrated_with.html
diff --git a/doc/website/content/qpid_project_etiquette_guide.html b/qpid/doc/website/content/qpid_project_etiquette_guide.html
similarity index 100%
rename from doc/website/content/qpid_project_etiquette_guide.html
rename to qpid/doc/website/content/qpid_project_etiquette_guide.html
diff --git a/doc/website/content/release_notes_0.10.html b/qpid/doc/website/content/release_notes_0.10.html
similarity index 100%
rename from doc/website/content/release_notes_0.10.html
rename to qpid/doc/website/content/release_notes_0.10.html
diff --git a/doc/website/content/release_notes_0.8.html b/qpid/doc/website/content/release_notes_0.8.html
similarity index 100%
rename from doc/website/content/release_notes_0.8.html
rename to qpid/doc/website/content/release_notes_0.8.html
diff --git a/doc/website/content/source_repository.html b/qpid/doc/website/content/source_repository.html
similarity index 100%
rename from doc/website/content/source_repository.html
rename to qpid/doc/website/content/source_repository.html
diff --git a/doc/website/example/images/asf-logo.png b/qpid/doc/website/example/images/asf-logo.png
similarity index 100%
rename from doc/website/example/images/asf-logo.png
rename to qpid/doc/website/example/images/asf-logo.png
Binary files differ
diff --git a/doc/website/example/images/asf_logo.gif b/qpid/doc/website/example/images/asf_logo.gif
similarity index 100%
rename from doc/website/example/images/asf_logo.gif
rename to qpid/doc/website/example/images/asf_logo.gif
Binary files differ
diff --git a/doc/website/example/images/header.png b/qpid/doc/website/example/images/header.png
similarity index 100%
rename from doc/website/example/images/header.png
rename to qpid/doc/website/example/images/header.png
Binary files differ
diff --git a/doc/website/example/images/main_body.png b/qpid/doc/website/example/images/main_body.png
similarity index 100%
rename from doc/website/example/images/main_body.png
rename to qpid/doc/website/example/images/main_body.png
Binary files differ
diff --git a/doc/website/example/images/main_bottom.png b/qpid/doc/website/example/images/main_bottom.png
similarity index 100%
rename from doc/website/example/images/main_bottom.png
rename to qpid/doc/website/example/images/main_bottom.png
Binary files differ
diff --git a/doc/website/example/images/main_top.png b/qpid/doc/website/example/images/main_top.png
similarity index 100%
rename from doc/website/example/images/main_top.png
rename to qpid/doc/website/example/images/main_top.png
Binary files differ
diff --git a/doc/website/example/images/menu_body.png b/qpid/doc/website/example/images/menu_body.png
similarity index 100%
rename from doc/website/example/images/menu_body.png
rename to qpid/doc/website/example/images/menu_body.png
Binary files differ
diff --git a/doc/website/example/images/menu_bottom.png b/qpid/doc/website/example/images/menu_bottom.png
similarity index 100%
rename from doc/website/example/images/menu_bottom.png
rename to qpid/doc/website/example/images/menu_bottom.png
Binary files differ
diff --git a/doc/website/example/images/menu_top.png b/qpid/doc/website/example/images/menu_top.png
similarity index 100%
rename from doc/website/example/images/menu_top.png
rename to qpid/doc/website/example/images/menu_top.png
Binary files differ
diff --git a/doc/website/example/images/qpid-logo-900x480.png b/qpid/doc/website/example/images/qpid-logo-900x480.png
similarity index 100%
rename from doc/website/example/images/qpid-logo-900x480.png
rename to qpid/doc/website/example/images/qpid-logo-900x480.png
Binary files differ
diff --git a/doc/website/example/images/qpid-logo.png b/qpid/doc/website/example/images/qpid-logo.png
similarity index 100%
rename from doc/website/example/images/qpid-logo.png
rename to qpid/doc/website/example/images/qpid-logo.png
Binary files differ
diff --git a/doc/website/example/index.html b/qpid/doc/website/example/index.html
similarity index 100%
rename from doc/website/example/index.html
rename to qpid/doc/website/example/index.html
diff --git a/doc/website/example/style.css b/qpid/doc/website/example/style.css
similarity index 100%
rename from doc/website/example/style.css
rename to qpid/doc/website/example/style.css
diff --git a/doc/website/template/images/asf-logo.png b/qpid/doc/website/template/images/asf-logo.png
similarity index 100%
rename from doc/website/template/images/asf-logo.png
rename to qpid/doc/website/template/images/asf-logo.png
Binary files differ
diff --git a/doc/website/template/images/asf_logo.gif b/qpid/doc/website/template/images/asf_logo.gif
similarity index 100%
rename from doc/website/template/images/asf_logo.gif
rename to qpid/doc/website/template/images/asf_logo.gif
Binary files differ
diff --git a/doc/website/template/images/header.png b/qpid/doc/website/template/images/header.png
similarity index 100%
rename from doc/website/template/images/header.png
rename to qpid/doc/website/template/images/header.png
Binary files differ
diff --git a/doc/website/template/images/main_body.png b/qpid/doc/website/template/images/main_body.png
similarity index 100%
rename from doc/website/template/images/main_body.png
rename to qpid/doc/website/template/images/main_body.png
Binary files differ
diff --git a/doc/website/template/images/main_bottom.png b/qpid/doc/website/template/images/main_bottom.png
similarity index 100%
rename from doc/website/template/images/main_bottom.png
rename to qpid/doc/website/template/images/main_bottom.png
Binary files differ
diff --git a/doc/website/template/images/main_top.png b/qpid/doc/website/template/images/main_top.png
similarity index 100%
rename from doc/website/template/images/main_top.png
rename to qpid/doc/website/template/images/main_top.png
Binary files differ
diff --git a/doc/website/template/images/menu_body.png b/qpid/doc/website/template/images/menu_body.png
similarity index 100%
rename from doc/website/template/images/menu_body.png
rename to qpid/doc/website/template/images/menu_body.png
Binary files differ
diff --git a/doc/website/template/images/menu_bottom.png b/qpid/doc/website/template/images/menu_bottom.png
similarity index 100%
rename from doc/website/template/images/menu_bottom.png
rename to qpid/doc/website/template/images/menu_bottom.png
Binary files differ
diff --git a/doc/website/template/images/menu_top.png b/qpid/doc/website/template/images/menu_top.png
similarity index 100%
rename from doc/website/template/images/menu_top.png
rename to qpid/doc/website/template/images/menu_top.png
Binary files differ
diff --git a/doc/website/template/images/qpid-logo-900x480.png b/qpid/doc/website/template/images/qpid-logo-900x480.png
similarity index 100%
rename from doc/website/template/images/qpid-logo-900x480.png
rename to qpid/doc/website/template/images/qpid-logo-900x480.png
Binary files differ
diff --git a/doc/website/template/images/qpid-logo.png b/qpid/doc/website/template/images/qpid-logo.png
similarity index 100%
rename from doc/website/template/images/qpid-logo.png
rename to qpid/doc/website/template/images/qpid-logo.png
Binary files differ
diff --git a/doc/website/template/style.css b/qpid/doc/website/template/style.css
similarity index 100%
rename from doc/website/template/style.css
rename to qpid/doc/website/template/style.css
diff --git a/doc/website/template/template.html b/qpid/doc/website/template/template.html
similarity index 100%
rename from doc/website/template/template.html
rename to qpid/doc/website/template/template.html
diff --git a/doc/website/tools/generate b/qpid/doc/website/tools/generate
similarity index 100%
rename from doc/website/tools/generate
rename to qpid/doc/website/tools/generate
diff --git a/doc/website/tools/wrap b/qpid/doc/website/tools/wrap
similarity index 100%
rename from doc/website/tools/wrap
rename to qpid/doc/website/tools/wrap
diff --git a/dotnet/Consumer/Program.cs b/qpid/dotnet/Consumer/Program.cs
similarity index 100%
rename from dotnet/Consumer/Program.cs
rename to qpid/dotnet/Consumer/Program.cs
diff --git a/dotnet/Consumer/default.build b/qpid/dotnet/Consumer/default.build
similarity index 100%
rename from dotnet/Consumer/default.build
rename to qpid/dotnet/Consumer/default.build
diff --git a/dotnet/LICENSE.txt b/qpid/dotnet/LICENSE.txt
similarity index 100%
rename from dotnet/LICENSE.txt
rename to qpid/dotnet/LICENSE.txt
diff --git a/dotnet/NOTICE.txt b/qpid/dotnet/NOTICE.txt
similarity index 100%
rename from dotnet/NOTICE.txt
rename to qpid/dotnet/NOTICE.txt
diff --git a/dotnet/Producer/Program.cs b/qpid/dotnet/Producer/Program.cs
similarity index 100%
rename from dotnet/Producer/Program.cs
rename to qpid/dotnet/Producer/Program.cs
diff --git a/dotnet/Producer/default.build b/qpid/dotnet/Producer/default.build
similarity index 100%
rename from dotnet/Producer/default.build
rename to qpid/dotnet/Producer/default.build
diff --git a/dotnet/Program.cs b/qpid/dotnet/Program.cs
similarity index 100%
rename from dotnet/Program.cs
rename to qpid/dotnet/Program.cs
diff --git a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
similarity index 100%
rename from dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
rename to qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
diff --git a/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
similarity index 100%
rename from dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
rename to qpid/dotnet/Qpid.Buffer.Tests/SimpleByteBufferTests.cs
diff --git a/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs b/qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
similarity index 100%
rename from dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
rename to qpid/dotnet/Qpid.Buffer.Tests/SlicedByteBufferTests.cs
diff --git a/dotnet/Qpid.Buffer.Tests/default.build b/qpid/dotnet/Qpid.Buffer.Tests/default.build
similarity index 100%
rename from dotnet/Qpid.Buffer.Tests/default.build
rename to qpid/dotnet/Qpid.Buffer.Tests/default.build
diff --git a/dotnet/Qpid.Buffer/BufferOverflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/BufferOverflowException.cs
rename to qpid/dotnet/Qpid.Buffer/BufferOverflowException.cs
diff --git a/dotnet/Qpid.Buffer/BufferUnderflowException.cs b/qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/BufferUnderflowException.cs
rename to qpid/dotnet/Qpid.Buffer/BufferUnderflowException.cs
diff --git a/dotnet/Qpid.Buffer/ByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/ByteBuffer.cs
rename to qpid/dotnet/Qpid.Buffer/ByteBuffer.cs
diff --git a/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs b/qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
rename to qpid/dotnet/Qpid.Buffer/ByteBufferHexDumper.cs
diff --git a/dotnet/Qpid.Buffer/IByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/IByteBufferAllocator.cs
rename to qpid/dotnet/Qpid.Buffer/IByteBufferAllocator.cs
diff --git a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
similarity index 100%
rename from dotnet/Qpid.Buffer/Qpid.Buffer.csproj
rename to qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
diff --git a/dotnet/Qpid.Buffer/SimpleByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/SimpleByteBuffer.cs
rename to qpid/dotnet/Qpid.Buffer/SimpleByteBuffer.cs
diff --git a/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs b/qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
rename to qpid/dotnet/Qpid.Buffer/SimpleByteBufferAllocator.cs
diff --git a/dotnet/Qpid.Buffer/SlicedByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
similarity index 100%
rename from dotnet/Qpid.Buffer/SlicedByteBuffer.cs
rename to qpid/dotnet/Qpid.Buffer/SlicedByteBuffer.cs
diff --git a/dotnet/Qpid.Buffer/default.build b/qpid/dotnet/Qpid.Buffer/default.build
similarity index 100%
rename from dotnet/Qpid.Buffer/default.build
rename to qpid/dotnet/Qpid.Buffer/default.build
diff --git a/dotnet/Qpid.Client.Tests/App.config b/qpid/dotnet/Qpid.Client.Tests/App.config
similarity index 100%
rename from dotnet/Qpid.Client.Tests/App.config
rename to qpid/dotnet/Qpid.Client.Tests/App.config
diff --git a/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs b/qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
rename to qpid/dotnet/Qpid.Client.Tests/BrokerDetails/BrokerDetailsTest.cs
diff --git a/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs b/qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
rename to qpid/dotnet/Qpid.Client.Tests/Channel/ChannelMessageCreationTests.cs
diff --git a/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
rename to qpid/dotnet/Qpid.Client.Tests/Messages/MessageFactoryRegistryTests.cs
diff --git a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
similarity index 100%
rename from dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
rename to qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
diff --git a/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs b/qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
rename to qpid/dotnet/Qpid.Client.Tests/Security/CallbackHandlerRegistryTests.cs
diff --git a/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build
similarity index 100%
rename from dotnet/Qpid.Client.Tests/default.build
rename to qpid/dotnet/Qpid.Client.Tests/default.build
diff --git a/dotnet/Qpid.Client.Tests/interop/Consumer.cs b/qpid/dotnet/Qpid.Client.Tests/interop/Consumer.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/interop/Consumer.cs
rename to qpid/dotnet/Qpid.Client.Tests/interop/Consumer.cs
diff --git a/dotnet/Qpid.Client.Tests/interop/Producer.cs b/qpid/dotnet/Qpid.Client.Tests/interop/Producer.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/interop/Producer.cs
rename to qpid/dotnet/Qpid.Client.Tests/interop/Producer.cs
diff --git a/dotnet/Qpid.Client.Tests/interop/TopicListener.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/interop/TopicListener.cs
rename to qpid/dotnet/Qpid.Client.Tests/interop/TopicListener.cs
diff --git a/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs b/qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
rename to qpid/dotnet/Qpid.Client.Tests/interop/TopicPublisher.cs
diff --git a/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
similarity index 100%
rename from dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
rename to qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit-licence.txt
diff --git a/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll b/qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
similarity index 100%
rename from dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
rename to qpid/dotnet/Qpid.Client.Tests/lib/nunit/nunit.framework.dll
Binary files differ
diff --git a/dotnet/Qpid.Client.Tests/log4net.config b/qpid/dotnet/Qpid.Client.Tests/log4net.config
similarity index 100%
rename from dotnet/Qpid.Client.Tests/log4net.config
rename to qpid/dotnet/Qpid.Client.Tests/log4net.config
diff --git a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
similarity index 100%
rename from dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
rename to qpid/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
similarity index 100%
rename from dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
rename to qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketProcessor.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
similarity index 100%
rename from dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
rename to qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/BlockingSocketTransport.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
similarity index 100%
rename from dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
rename to qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/ByteChannel.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
similarity index 100%
rename from dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
rename to qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.csproj
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp b/qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
similarity index 100%
rename from dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
rename to qpid/dotnet/Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp
diff --git a/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs b/qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
rename to qpid/dotnet/Qpid.Client/Client/AMQAuthenticationException.cs
diff --git a/dotnet/Qpid.Client/Client/AMQConnection.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AMQConnection.cs
rename to qpid/dotnet/Qpid.Client/Client/AMQConnection.cs
diff --git a/dotnet/Qpid.Client/Client/AMQConnectionException.cs b/qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AMQConnectionException.cs
rename to qpid/dotnet/Qpid.Client/Client/AMQConnectionException.cs
diff --git a/dotnet/Qpid.Client/Client/AMQDestination.cs b/qpid/dotnet/Qpid.Client/Client/AMQDestination.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AMQDestination.cs
rename to qpid/dotnet/Qpid.Client/Client/AMQDestination.cs
diff --git a/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
rename to qpid/dotnet/Qpid.Client/Client/AMQNoConsumersException.cs
diff --git a/dotnet/Qpid.Client/Client/AMQNoRouteException.cs b/qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AMQNoRouteException.cs
rename to qpid/dotnet/Qpid.Client/Client/AMQNoRouteException.cs
diff --git a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
rename to qpid/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
diff --git a/dotnet/Qpid.Client/Client/AmqChannel.cs b/qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/AmqChannel.cs
rename to qpid/dotnet/Qpid.Client/Client/AmqChannel.cs
diff --git a/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
rename to qpid/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
diff --git a/dotnet/Qpid.Client/Client/BasicMessageProducer.cs b/qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/BasicMessageProducer.cs
rename to qpid/dotnet/Qpid.Client/Client/BasicMessageProducer.cs
diff --git a/dotnet/Qpid.Client/Client/Closeable.cs b/qpid/dotnet/Qpid.Client/Client/Closeable.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Closeable.cs
rename to qpid/dotnet/Qpid.Client/Client/Closeable.cs
diff --git a/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Configuration/AuthenticationConfigurationSectionHandler.cs
diff --git a/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs b/qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
rename to qpid/dotnet/Qpid.Client/Client/ConnectionTuneParameters.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverException.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Failover/FailoverException.cs
rename to qpid/dotnet/Qpid.Client/Client/Failover/FailoverException.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Failover/FailoverHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverState.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Failover/FailoverState.cs
rename to qpid/dotnet/Qpid.Client/Client/Failover/FailoverState.cs
diff --git a/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs b/qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
rename to qpid/dotnet/Qpid.Client/Client/Failover/FailoverSupport.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/BasicDeliverMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/BasicReturnMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ChannelCloseMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ConnectionCloseOkHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ConnectionOpenOkMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ConnectionRedirectMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ConnectionSecureMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ConnectionStartMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/ConnectionTuneMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/QueueDeleteOkMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs b/qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Handler/QueuePurgeOkMethodHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Message/AMQMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/AMQMessage.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/AMQMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/AMQMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/IMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/MessageFactoryRegistry.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/QpidHeaders.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs b/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessageFactory.cs
diff --git a/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/UnexpectedBodyReceivedException.cs
diff --git a/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs b/qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
rename to qpid/dotnet/Qpid.Client/Client/Message/UnprocessedMessage.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/AMQMethodEvent.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/AMQProtocolSession.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/DefaultTimeouts.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/IConnectionCloser.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/IProtocolListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/Listener/BlockingMethodFrameListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/Listener/IAMQMethodListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/Listener/SpecificMethodFrameListener.cs
diff --git a/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
rename to qpid/dotnet/Qpid.Client/Client/Protocol/ProtocolWriter.cs
diff --git a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
rename to qpid/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
diff --git a/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs b/qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
rename to qpid/dotnet/Qpid.Client/Client/Security/CallbackHandlerRegistry.cs
diff --git a/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Security/IAMQCallbackHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs b/qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Security/UsernamePasswordCallbackHandler.cs
diff --git a/dotnet/Qpid.Client/Client/SslOptions.cs b/qpid/dotnet/Qpid.Client/Client/SslOptions.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/SslOptions.cs
rename to qpid/dotnet/Qpid.Client/Client/SslOptions.cs
diff --git a/dotnet/Qpid.Client/Client/State/AMQState.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQState.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/AMQState.cs
rename to qpid/dotnet/Qpid.Client/Client/State/AMQState.cs
diff --git a/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
rename to qpid/dotnet/Qpid.Client/Client/State/AMQStateChangedEvent.cs
diff --git a/dotnet/Qpid.Client/Client/State/AMQStateManager.cs b/qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/AMQStateManager.cs
rename to qpid/dotnet/Qpid.Client/Client/State/AMQStateManager.cs
diff --git a/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
rename to qpid/dotnet/Qpid.Client/Client/State/IAMQStateListener.cs
diff --git a/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
rename to qpid/dotnet/Qpid.Client/Client/State/IStateAwareMethodListener.cs
diff --git a/dotnet/Qpid.Client/Client/State/IStateListener.cs b/qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/IStateListener.cs
rename to qpid/dotnet/Qpid.Client/Client/State/IStateListener.cs
diff --git a/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs b/qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
rename to qpid/dotnet/Qpid.Client/Client/State/IllegalStateTransitionException.cs
diff --git a/dotnet/Qpid.Client/Client/State/StateWaiter.cs b/qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/State/StateWaiter.cs
rename to qpid/dotnet/Qpid.Client/Client/State/StateWaiter.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/AMQProtocolProvider.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/AmqpChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/IByteChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/IProtocolChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/IProtocolWriter.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/IStreamFilter.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/ITransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/ITransport.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/ITransport.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/IoHandler.cs b/qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/IoHandler.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/IoHandler.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/ProtocolDecoderOutput.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/SingleProtocolEncoderOutput.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/BlockingSocketTransport.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ByteChannel.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/ISocketConnector.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SocketConnector.cs
diff --git a/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs b/qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
rename to qpid/dotnet/Qpid.Client/Client/Transport/Socket/Blocking/SslSocketConnector.cs
diff --git a/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs b/qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
similarity index 100%
rename from dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
rename to qpid/dotnet/Qpid.Client/Client/Util/FlowControlQueue.cs
diff --git a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Client/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Client/Qpid.Client.csproj b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
similarity index 100%
rename from dotnet/Qpid.Client/Qpid.Client.csproj
rename to qpid/dotnet/Qpid.Client/Qpid.Client.csproj
diff --git a/dotnet/Qpid.Client/default.build b/qpid/dotnet/Qpid.Client/default.build
similarity index 100%
rename from dotnet/Qpid.Client/default.build
rename to qpid/dotnet/Qpid.Client/default.build
diff --git a/dotnet/Qpid.Client/qms/BrokerInfo.cs b/qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
similarity index 100%
rename from dotnet/Qpid.Client/qms/BrokerInfo.cs
rename to qpid/dotnet/Qpid.Client/qms/BrokerInfo.cs
diff --git a/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
similarity index 100%
rename from dotnet/Qpid.Client/qms/ConnectionInfo.cs
rename to qpid/dotnet/Qpid.Client/qms/ConnectionInfo.cs
diff --git a/dotnet/Qpid.Client/qms/FailoverPolicy.cs b/qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
similarity index 100%
rename from dotnet/Qpid.Client/qms/FailoverPolicy.cs
rename to qpid/dotnet/Qpid.Client/qms/FailoverPolicy.cs
diff --git a/dotnet/Qpid.Client/qms/UrlSyntaxException.cs b/qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
similarity index 100%
rename from dotnet/Qpid.Client/qms/UrlSyntaxException.cs
rename to qpid/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
diff --git a/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
similarity index 100%
rename from dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
rename to qpid/dotnet/Qpid.Client/qms/failover/FailoverMethod.cs
diff --git a/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
similarity index 100%
rename from dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
rename to qpid/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
diff --git a/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs b/qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
similarity index 100%
rename from dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
rename to qpid/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
diff --git a/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
similarity index 100%
rename from dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
rename to qpid/dotnet/Qpid.Codec/CumulativeProtocolDecoder.cs
diff --git a/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
rename to qpid/dotnet/Qpid.Codec/Demux/DemuxingProtocolCodecFactory.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
rename to qpid/dotnet/Qpid.Codec/Demux/IMessageDecoder.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
rename to qpid/dotnet/Qpid.Codec/Demux/IMessageDecoderFactory.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
rename to qpid/dotnet/Qpid.Codec/Demux/IMessageEncoder.cs
diff --git a/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs b/qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
rename to qpid/dotnet/Qpid.Codec/Demux/IMessageEncoderFactory.cs
diff --git a/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs b/qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
rename to qpid/dotnet/Qpid.Codec/Demux/MessageDecoderResult.cs
diff --git a/dotnet/Qpid.Codec/IProtocolCodecFactory.cs b/qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
similarity index 100%
rename from dotnet/Qpid.Codec/IProtocolCodecFactory.cs
rename to qpid/dotnet/Qpid.Codec/IProtocolCodecFactory.cs
diff --git a/dotnet/Qpid.Codec/IProtocolDecoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs
similarity index 100%
rename from dotnet/Qpid.Codec/IProtocolDecoder.cs
rename to qpid/dotnet/Qpid.Codec/IProtocolDecoder.cs
diff --git a/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
similarity index 100%
rename from dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
rename to qpid/dotnet/Qpid.Codec/IProtocolDecoderOutput.cs
diff --git a/dotnet/Qpid.Codec/IProtocolEncoder.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs
similarity index 100%
rename from dotnet/Qpid.Codec/IProtocolEncoder.cs
rename to qpid/dotnet/Qpid.Codec/IProtocolEncoder.cs
diff --git a/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
similarity index 100%
rename from dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
rename to qpid/dotnet/Qpid.Codec/IProtocolEncoderOutput.cs
diff --git a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Codec/ProtocolCodecException.cs b/qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs
similarity index 100%
rename from dotnet/Qpid.Codec/ProtocolCodecException.cs
rename to qpid/dotnet/Qpid.Codec/ProtocolCodecException.cs
diff --git a/dotnet/Qpid.Codec/ProtocolDecoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs
similarity index 100%
rename from dotnet/Qpid.Codec/ProtocolDecoderException.cs
rename to qpid/dotnet/Qpid.Codec/ProtocolDecoderException.cs
diff --git a/dotnet/Qpid.Codec/ProtocolEncoderException.cs b/qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs
similarity index 100%
rename from dotnet/Qpid.Codec/ProtocolEncoderException.cs
rename to qpid/dotnet/Qpid.Codec/ProtocolEncoderException.cs
diff --git a/dotnet/Qpid.Codec/Qpid.Codec.csproj b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
similarity index 100%
rename from dotnet/Qpid.Codec/Qpid.Codec.csproj
rename to qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
diff --git a/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
rename to qpid/dotnet/Qpid.Codec/Support/SimpleProtocolDecoderOutput.cs
diff --git a/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs b/qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
similarity index 100%
rename from dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
rename to qpid/dotnet/Qpid.Codec/Support/SimpleProtocolEncoderOutput.cs
diff --git a/dotnet/Qpid.Codec/default.build b/qpid/dotnet/Qpid.Codec/default.build
similarity index 100%
rename from dotnet/Qpid.Codec/default.build
rename to qpid/dotnet/Qpid.Codec/default.build
diff --git a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
similarity index 100%
rename from dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
rename to qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
similarity index 100%
rename from dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
rename to qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestConsumerProducerQueue.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
similarity index 100%
rename from dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
rename to qpid/dotnet/Qpid.Common.Tests/Qpid/Collections/TestLinkedHashtable.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
similarity index 100%
rename from dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
rename to qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestAMQType.cs
diff --git a/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs b/qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
similarity index 100%
rename from dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
rename to qpid/dotnet/Qpid.Common.Tests/Qpid/Framing/TestEncodingUtils.cs
diff --git a/dotnet/Qpid.Common.Tests/default.build b/qpid/dotnet/Qpid.Common.Tests/default.build
similarity index 100%
rename from dotnet/Qpid.Common.Tests/default.build
rename to qpid/dotnet/Qpid.Common.Tests/default.build
diff --git a/dotnet/Qpid.Common/AMQChannelClosedException.cs b/qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs
similarity index 100%
rename from dotnet/Qpid.Common/AMQChannelClosedException.cs
rename to qpid/dotnet/Qpid.Common/AMQChannelClosedException.cs
diff --git a/dotnet/Qpid.Common/AMQConnectionClosedException.cs b/qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs
similarity index 100%
rename from dotnet/Qpid.Common/AMQConnectionClosedException.cs
rename to qpid/dotnet/Qpid.Common/AMQConnectionClosedException.cs
diff --git a/dotnet/Qpid.Common/AMQDisconnectedException.cs b/qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs
similarity index 100%
rename from dotnet/Qpid.Common/AMQDisconnectedException.cs
rename to qpid/dotnet/Qpid.Common/AMQDisconnectedException.cs
diff --git a/dotnet/Qpid.Common/AMQException.cs b/qpid/dotnet/Qpid.Common/AMQException.cs
similarity index 100%
rename from dotnet/Qpid.Common/AMQException.cs
rename to qpid/dotnet/Qpid.Common/AMQException.cs
diff --git a/dotnet/Qpid.Common/AMQInvalidArgumentException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
similarity index 100%
rename from dotnet/Qpid.Common/AMQInvalidArgumentException.cs
rename to qpid/dotnet/Qpid.Common/AMQInvalidArgumentException.cs
diff --git a/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs b/qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
similarity index 100%
rename from dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
rename to qpid/dotnet/Qpid.Common/AMQInvalidRoutingKeyException.cs
diff --git a/dotnet/Qpid.Common/AMQUndeliveredException.cs b/qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs
similarity index 100%
rename from dotnet/Qpid.Common/AMQUndeliveredException.cs
rename to qpid/dotnet/Qpid.Common/AMQUndeliveredException.cs
diff --git a/dotnet/Qpid.Common/AssemblySettings.cs b/qpid/dotnet/Qpid.Common/AssemblySettings.cs
similarity index 100%
rename from dotnet/Qpid.Common/AssemblySettings.cs
rename to qpid/dotnet/Qpid.Common/AssemblySettings.cs
diff --git a/dotnet/Qpid.Common/Collections/BlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs
similarity index 100%
rename from dotnet/Qpid.Common/Collections/BlockingQueue.cs
rename to qpid/dotnet/Qpid.Common/Collections/BlockingQueue.cs
diff --git a/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs b/qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
similarity index 100%
rename from dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
rename to qpid/dotnet/Qpid.Common/Collections/ConsumerProducerQueue.cs
diff --git a/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
similarity index 100%
rename from dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
rename to qpid/dotnet/Qpid.Common/Collections/LinkedBlockingQueue.cs
diff --git a/dotnet/Qpid.Common/Collections/LinkedHashtable.cs b/qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
similarity index 100%
rename from dotnet/Qpid.Common/Collections/LinkedHashtable.cs
rename to qpid/dotnet/Qpid.Common/Collections/LinkedHashtable.cs
diff --git a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
similarity index 100%
rename from dotnet/Qpid.Common/Collections/SynchronousQueue.cs
rename to qpid/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQDataBlockDecoder.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs b/qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQDataBlockEncoder.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQFrame.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQFrame.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQFrame.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQFrameDecodingException.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQMethodBody.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQMethodBody.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQMethodBody.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQMethodBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs b/qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQProtocolHeaderException.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQType.cs b/qpid/dotnet/Qpid.Common/Framing/AMQType.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQType.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQType.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQTypeMap.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQTypeMap.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQTypeMap.cs
diff --git a/dotnet/Qpid.Common/Framing/AMQTypedValue.cs b/qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/AMQTypedValue.cs
rename to qpid/dotnet/Qpid.Common/Framing/AMQTypedValue.cs
diff --git a/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
rename to qpid/dotnet/Qpid.Common/Framing/BasicContentHeaderProperties.cs
diff --git a/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
rename to qpid/dotnet/Qpid.Common/Framing/CompositeAMQDataBlock.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBody.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/ContentBody.cs
rename to qpid/dotnet/Qpid.Common/Framing/ContentBody.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
rename to qpid/dotnet/Qpid.Common/Framing/ContentBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
rename to qpid/dotnet/Qpid.Common/Framing/ContentHeaderBody.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
rename to qpid/dotnet/Qpid.Common/Framing/ContentHeaderBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs b/qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
rename to qpid/dotnet/Qpid.Common/Framing/ContentHeaderPropertiesFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/EncodingUtils.cs b/qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/EncodingUtils.cs
rename to qpid/dotnet/Qpid.Common/Framing/EncodingUtils.cs
diff --git a/dotnet/Qpid.Common/Framing/FieldTable.cs b/qpid/dotnet/Qpid.Common/Framing/FieldTable.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/FieldTable.cs
rename to qpid/dotnet/Qpid.Common/Framing/FieldTable.cs
diff --git a/dotnet/Qpid.Common/Framing/HeartbeatBody.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/HeartbeatBody.cs
rename to qpid/dotnet/Qpid.Common/Framing/HeartbeatBody.cs
diff --git a/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
rename to qpid/dotnet/Qpid.Common/Framing/HeartbeatBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/IBody.cs b/qpid/dotnet/Qpid.Common/Framing/IBody.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/IBody.cs
rename to qpid/dotnet/Qpid.Common/Framing/IBody.cs
diff --git a/dotnet/Qpid.Common/Framing/IBodyFactory.cs b/qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/IBodyFactory.cs
rename to qpid/dotnet/Qpid.Common/Framing/IBodyFactory.cs
diff --git a/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs b/qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
rename to qpid/dotnet/Qpid.Common/Framing/IContentHeaderProperties.cs
diff --git a/dotnet/Qpid.Common/Framing/IDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/IDataBlock.cs
rename to qpid/dotnet/Qpid.Common/Framing/IDataBlock.cs
diff --git a/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs b/qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
rename to qpid/dotnet/Qpid.Common/Framing/IEncodableAMQDataBlock.cs
diff --git a/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs b/qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
similarity index 100%
rename from dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
rename to qpid/dotnet/Qpid.Common/Framing/ProtocolInitiation.cs
diff --git a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Common/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Common/Protocol/AMQConstant.cs b/qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs
similarity index 100%
rename from dotnet/Qpid.Common/Protocol/AMQConstant.cs
rename to qpid/dotnet/Qpid.Common/Protocol/AMQConstant.cs
diff --git a/dotnet/Qpid.Common/Qpid.Common.csproj b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
similarity index 100%
rename from dotnet/Qpid.Common/Qpid.Common.csproj
rename to qpid/dotnet/Qpid.Common/Qpid.Common.csproj
diff --git a/dotnet/Qpid.Common/amqp.xml b/qpid/dotnet/Qpid.Common/amqp.xml
similarity index 100%
rename from dotnet/Qpid.Common/amqp.xml
rename to qpid/dotnet/Qpid.Common/amqp.xml
diff --git a/dotnet/Qpid.Common/build.xml b/qpid/dotnet/Qpid.Common/build.xml
similarity index 100%
rename from dotnet/Qpid.Common/build.xml
rename to qpid/dotnet/Qpid.Common/build.xml
diff --git a/dotnet/Qpid.Common/default.build b/qpid/dotnet/Qpid.Common/default.build
similarity index 100%
rename from dotnet/Qpid.Common/default.build
rename to qpid/dotnet/Qpid.Common/default.build
diff --git a/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt b/qpid/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
similarity index 100%
rename from dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
rename to qpid/dotnet/Qpid.Common/lib/log4net/log4net-licence.txt
diff --git a/dotnet/Qpid.Common/lib/log4net/log4net.dll b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.dll
similarity index 100%
rename from dotnet/Qpid.Common/lib/log4net/log4net.dll
rename to qpid/dotnet/Qpid.Common/lib/log4net/log4net.dll
Binary files differ
diff --git a/dotnet/Qpid.Common/lib/log4net/log4net.xml b/qpid/dotnet/Qpid.Common/lib/log4net/log4net.xml
similarity index 100%
rename from dotnet/Qpid.Common/lib/log4net/log4net.xml
rename to qpid/dotnet/Qpid.Common/lib/log4net/log4net.xml
diff --git a/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt b/qpid/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
similarity index 100%
rename from dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
rename to qpid/dotnet/Qpid.Common/lib/saxon/saxon-licence.txt
diff --git a/dotnet/Qpid.Common/lib/saxon/saxon8.jar b/qpid/dotnet/Qpid.Common/lib/saxon/saxon8.jar
similarity index 100%
rename from dotnet/Qpid.Common/lib/saxon/saxon8.jar
rename to qpid/dotnet/Qpid.Common/lib/saxon/saxon8.jar
Binary files differ
diff --git a/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
similarity index 100%
rename from dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
rename to qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll
Binary files differ
diff --git a/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt b/qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
similarity index 100%
rename from dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
rename to qpid/dotnet/Qpid.Common/lib/seclib-1.0.0/seclib-license.txt
diff --git a/dotnet/Qpid.Common/resources/registry.template b/qpid/dotnet/Qpid.Common/resources/registry.template
similarity index 100%
rename from dotnet/Qpid.Common/resources/registry.template
rename to qpid/dotnet/Qpid.Common/resources/registry.template
diff --git a/dotnet/Qpid.Common/stylesheets/csharp.xsl b/qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/csharp.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/csharp.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/framing.xsl b/qpid/dotnet/Qpid.Common/stylesheets/framing.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/framing.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/framing.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/java.xsl b/qpid/dotnet/Qpid.Common/stylesheets/java.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/java.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/java.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/prepare1.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare1.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/prepare1.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/prepare1.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/prepare2.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare2.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/prepare2.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/prepare2.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/prepare3.xsl b/qpid/dotnet/Qpid.Common/stylesheets/prepare3.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/prepare3.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/prepare3.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/readme.txt b/qpid/dotnet/Qpid.Common/stylesheets/readme.txt
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/readme.txt
rename to qpid/dotnet/Qpid.Common/stylesheets/readme.txt
diff --git a/dotnet/Qpid.Common/stylesheets/registry.xsl b/qpid/dotnet/Qpid.Common/stylesheets/registry.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/registry.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/registry.xsl
diff --git a/dotnet/Qpid.Common/stylesheets/utils.xsl b/qpid/dotnet/Qpid.Common/stylesheets/utils.xsl
similarity index 100%
rename from dotnet/Qpid.Common/stylesheets/utils.xsl
rename to qpid/dotnet/Qpid.Common/stylesheets/utils.xsl
diff --git a/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Integration.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj b/qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
rename to qpid/dotnet/Qpid.Integration.Tests/Qpid.Integration.Tests.csproj
diff --git a/dotnet/Qpid.Integration.Tests/README.txt b/qpid/dotnet/Qpid.Integration.Tests/README.txt
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/README.txt
rename to qpid/dotnet/Qpid.Integration.Tests/README.txt
diff --git a/dotnet/Qpid.Integration.Tests/default.build b/qpid/dotnet/Qpid.Integration.Tests/default.build
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/default.build
rename to qpid/dotnet/Qpid.Integration.Tests/default.build
diff --git a/dotnet/Qpid.Integration.Tests/framework/Assertion.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Assertion.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Assertion.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Assertion.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Assertion.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/AssertionBase.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/BrokerLifecycleAware.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailure.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/CauseFailureUserPrompt.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/Circuit.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Circuit.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Circuit.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Circuit.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Circuit.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEnd.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/CircuitEndBase.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/ExceptionMonitor.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/FrameworkBaseCase.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/LocalCircuitFactory.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/MessageMonitor.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/MessagingTestConfigProperties.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/NotApplicableAssertion.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/Publisher.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Publisher.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Publisher.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Publisher.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Publisher.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/README.txt b/qpid/dotnet/Qpid.Integration.Tests/framework/README.txt
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/README.txt
rename to qpid/dotnet/Qpid.Integration.Tests/framework/README.txt
diff --git a/dotnet/Qpid.Integration.Tests/framework/Receiver.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Receiver.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/Receiver.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/Receiver.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/Receiver.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/TestClientDetails.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestModel.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/TestModel.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/TestModel.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/TestModel.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/TestUtils.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/alljava.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/alljava.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/alljava.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/alljava.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchFailureException.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchThread.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/ClockSynchronizer.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/LocalClockSynchronizer.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/clocksynch/UDPClockSynchronizer.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClient.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientCircuitEnd.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/distributedcircuit/TestClientControlledTest.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalCircuitImpl.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalPublisherImpl.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/localcircuit/LocalReceiverImpl.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/BaseCircuitFactory.csx
diff --git a/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
rename to qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.cs
diff --git a/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx b/qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
rename to qpid/dotnet/Qpid.Integration.Tests/framework/sequencers/CircuitFactory.csx
diff --git a/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs b/qpid/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interactive/FailoverTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs b/qpid/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interactive/SendReceiveTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interop/InteropClientTestCase.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase1DummyRun.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase2BasicP2P.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase3BasicPubSub.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase4P2PMessageSize.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interop/TestCases/TestCase5PubSubMessageSize.cs
diff --git a/dotnet/Qpid.Integration.Tests/interop/TestClient.cs b/qpid/dotnet/Qpid.Integration.Tests/interop/TestClient.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/interop/TestClient.cs
rename to qpid/dotnet/Qpid.Integration.Tests/interop/TestClient.cs
diff --git a/dotnet/Qpid.Integration.Tests/log4net.config b/qpid/dotnet/Qpid.Integration.Tests/log4net.config
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/log4net.config
rename to qpid/dotnet/Qpid.Integration.Tests/log4net.config
diff --git a/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp b/qpid/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
rename to qpid/dotnet/Qpid.Integration.Tests/old/ServiceProvidingClient.tmp
diff --git a/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp b/qpid/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
rename to qpid/dotnet/Qpid.Integration.Tests/old/ServiceRequestingClient.tmp
diff --git a/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/ConnectionTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/MandatoryMessageTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj b/qpid/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
diff --git a/dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/QueueBrowsingTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
diff --git a/dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs b/qpid/dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs
similarity index 100%
rename from dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs
rename to qpid/dotnet/Qpid.Integration.Tests/testcases/SustainedTest.cs
diff --git a/dotnet/Qpid.Messaging/AcknowledgeMode.cs b/qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/AcknowledgeMode.cs
rename to qpid/dotnet/Qpid.Messaging/AcknowledgeMode.cs
diff --git a/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs b/qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
rename to qpid/dotnet/Qpid.Messaging/ChannelLimitReachedException.cs
diff --git a/dotnet/Qpid.Messaging/DeliveryMode.cs b/qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/DeliveryMode.cs
rename to qpid/dotnet/Qpid.Messaging/DeliveryMode.cs
diff --git a/dotnet/Qpid.Messaging/ExchangeClassConstants.cs b/qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/ExchangeClassConstants.cs
rename to qpid/dotnet/Qpid.Messaging/ExchangeClassConstants.cs
diff --git a/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs b/qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
rename to qpid/dotnet/Qpid.Messaging/ExchangeNameDefaults.cs
diff --git a/dotnet/Qpid.Messaging/IBytesMessage.cs b/qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IBytesMessage.cs
rename to qpid/dotnet/Qpid.Messaging/IBytesMessage.cs
diff --git a/dotnet/Qpid.Messaging/IChannel.cs b/qpid/dotnet/Qpid.Messaging/IChannel.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IChannel.cs
rename to qpid/dotnet/Qpid.Messaging/IChannel.cs
diff --git a/dotnet/Qpid.Messaging/ICloseable.cs b/qpid/dotnet/Qpid.Messaging/ICloseable.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/ICloseable.cs
rename to qpid/dotnet/Qpid.Messaging/ICloseable.cs
diff --git a/dotnet/Qpid.Messaging/IConnection.cs b/qpid/dotnet/Qpid.Messaging/IConnection.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IConnection.cs
rename to qpid/dotnet/Qpid.Messaging/IConnection.cs
diff --git a/dotnet/Qpid.Messaging/IConnectionFactory.cs b/qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IConnectionFactory.cs
rename to qpid/dotnet/Qpid.Messaging/IConnectionFactory.cs
diff --git a/dotnet/Qpid.Messaging/IConnectionListener.cs b/qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IConnectionListener.cs
rename to qpid/dotnet/Qpid.Messaging/IConnectionListener.cs
diff --git a/dotnet/Qpid.Messaging/IFieldTable.cs b/qpid/dotnet/Qpid.Messaging/IFieldTable.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IFieldTable.cs
rename to qpid/dotnet/Qpid.Messaging/IFieldTable.cs
diff --git a/dotnet/Qpid.Messaging/IHeaders.cs b/qpid/dotnet/Qpid.Messaging/IHeaders.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IHeaders.cs
rename to qpid/dotnet/Qpid.Messaging/IHeaders.cs
diff --git a/dotnet/Qpid.Messaging/IMessage.cs b/qpid/dotnet/Qpid.Messaging/IMessage.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IMessage.cs
rename to qpid/dotnet/Qpid.Messaging/IMessage.cs
diff --git a/dotnet/Qpid.Messaging/IMessageConsumer.cs b/qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IMessageConsumer.cs
rename to qpid/dotnet/Qpid.Messaging/IMessageConsumer.cs
diff --git a/dotnet/Qpid.Messaging/IMessagePublisher.cs b/qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/IMessagePublisher.cs
rename to qpid/dotnet/Qpid.Messaging/IMessagePublisher.cs
diff --git a/dotnet/Qpid.Messaging/ITextMessage.cs b/qpid/dotnet/Qpid.Messaging/ITextMessage.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/ITextMessage.cs
rename to qpid/dotnet/Qpid.Messaging/ITextMessage.cs
diff --git a/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
rename to qpid/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
diff --git a/dotnet/Qpid.Messaging/MessageNotReadableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/MessageNotReadableException.cs
rename to qpid/dotnet/Qpid.Messaging/MessageNotReadableException.cs
diff --git a/dotnet/Qpid.Messaging/MessageNotWritableException.cs b/qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/MessageNotWritableException.cs
rename to qpid/dotnet/Qpid.Messaging/MessageNotWritableException.cs
diff --git a/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
rename to qpid/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
diff --git a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
similarity index 100%
rename from dotnet/Qpid.Messaging/Qpid.Messaging.csproj
rename to qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
diff --git a/dotnet/Qpid.Messaging/QpidException.cs b/qpid/dotnet/Qpid.Messaging/QpidException.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/QpidException.cs
rename to qpid/dotnet/Qpid.Messaging/QpidException.cs
diff --git a/dotnet/Qpid.Messaging/ResourceAllocationException.cs b/qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
similarity index 100%
rename from dotnet/Qpid.Messaging/ResourceAllocationException.cs
rename to qpid/dotnet/Qpid.Messaging/ResourceAllocationException.cs
diff --git a/dotnet/Qpid.Messaging/default.build b/qpid/dotnet/Qpid.Messaging/default.build
similarity index 100%
rename from dotnet/Qpid.Messaging/default.build
rename to qpid/dotnet/Qpid.Messaging/default.build
diff --git a/dotnet/Qpid.NET.FxCop b/qpid/dotnet/Qpid.NET.FxCop
similarity index 100%
rename from dotnet/Qpid.NET.FxCop
rename to qpid/dotnet/Qpid.NET.FxCop
diff --git a/dotnet/Qpid.NET.sln b/qpid/dotnet/Qpid.NET.sln
similarity index 100%
rename from dotnet/Qpid.NET.sln
rename to qpid/dotnet/Qpid.NET.sln
diff --git a/dotnet/Qpid.Sasl.Tests/App.config b/qpid/dotnet/Qpid.Sasl.Tests/App.config
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/App.config
rename to qpid/dotnet/Qpid.Sasl.Tests/App.config
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/AnonymousSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/CramMD5SaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/PlainSaslClientTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
rename to qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
diff --git a/dotnet/Qpid.Sasl.Tests/SaslTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/SaslTests.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/SaslTests.cs
diff --git a/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs b/qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
rename to qpid/dotnet/Qpid.Sasl.Tests/TestClientFactory.cs
diff --git a/dotnet/Qpid.Sasl.Tests/default.build b/qpid/dotnet/Qpid.Sasl.Tests/default.build
similarity index 100%
rename from dotnet/Qpid.Sasl.Tests/default.build
rename to qpid/dotnet/Qpid.Sasl.Tests/default.build
diff --git a/dotnet/Qpid.Sasl/Callbacks.cs b/qpid/dotnet/Qpid.Sasl/Callbacks.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Callbacks.cs
rename to qpid/dotnet/Qpid.Sasl/Callbacks.cs
diff --git a/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
rename to qpid/dotnet/Qpid.Sasl/Configuration/SaslConfiguration.cs
diff --git a/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs b/qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
rename to qpid/dotnet/Qpid.Sasl/Configuration/SaslConfigurationSectionHandler.cs
diff --git a/dotnet/Qpid.Sasl/DefaultClientFactory.cs b/qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/DefaultClientFactory.cs
rename to qpid/dotnet/Qpid.Sasl/DefaultClientFactory.cs
diff --git a/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs b/qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
rename to qpid/dotnet/Qpid.Sasl/ISaslCallbackHandler.cs
diff --git a/dotnet/Qpid.Sasl/ISaslClient.cs b/qpid/dotnet/Qpid.Sasl/ISaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/ISaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/ISaslClient.cs
diff --git a/dotnet/Qpid.Sasl/ISaslClientFactory.cs b/qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/ISaslClientFactory.cs
rename to qpid/dotnet/Qpid.Sasl/ISaslClientFactory.cs
diff --git a/dotnet/Qpid.Sasl/MD5HMAC.cs b/qpid/dotnet/Qpid.Sasl/MD5HMAC.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/MD5HMAC.cs
rename to qpid/dotnet/Qpid.Sasl/MD5HMAC.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/Mechanisms/AnonymousSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5HexSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/Mechanisms/CramMD5SaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/Mechanisms/DigestSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/Mechanisms/ExternalSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs b/qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/Mechanisms/PlainSaslClient.cs
diff --git a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
rename to qpid/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
diff --git a/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
similarity index 100%
rename from dotnet/Qpid.Sasl/Qpid.Sasl.csproj
rename to qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
diff --git a/dotnet/Qpid.Sasl/Sasl.cs b/qpid/dotnet/Qpid.Sasl/Sasl.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/Sasl.cs
rename to qpid/dotnet/Qpid.Sasl/Sasl.cs
diff --git a/dotnet/Qpid.Sasl/SaslClient.cs b/qpid/dotnet/Qpid.Sasl/SaslClient.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/SaslClient.cs
rename to qpid/dotnet/Qpid.Sasl/SaslClient.cs
diff --git a/dotnet/Qpid.Sasl/SaslException.cs b/qpid/dotnet/Qpid.Sasl/SaslException.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/SaslException.cs
rename to qpid/dotnet/Qpid.Sasl/SaslException.cs
diff --git a/dotnet/Qpid.Sasl/SaslProperties.cs b/qpid/dotnet/Qpid.Sasl/SaslProperties.cs
similarity index 100%
rename from dotnet/Qpid.Sasl/SaslProperties.cs
rename to qpid/dotnet/Qpid.Sasl/SaslProperties.cs
diff --git a/dotnet/Qpid.Sasl/default.build b/qpid/dotnet/Qpid.Sasl/default.build
similarity index 100%
rename from dotnet/Qpid.Sasl/default.build
rename to qpid/dotnet/Qpid.Sasl/default.build
diff --git a/dotnet/README.txt b/qpid/dotnet/README.txt
similarity index 100%
rename from dotnet/README.txt
rename to qpid/dotnet/README.txt
diff --git a/dotnet/RELEASE_NOTES.txt b/qpid/dotnet/RELEASE_NOTES.txt
similarity index 100%
rename from dotnet/RELEASE_NOTES.txt
rename to qpid/dotnet/RELEASE_NOTES.txt
diff --git a/dotnet/TestClient/Program.cs b/qpid/dotnet/TestClient/Program.cs
similarity index 100%
rename from dotnet/TestClient/Program.cs
rename to qpid/dotnet/TestClient/Program.cs
diff --git a/dotnet/TestClient/Properties/AssemblyInfo.cs b/qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/TestClient/Properties/AssemblyInfo.cs
rename to qpid/dotnet/TestClient/Properties/AssemblyInfo.cs
diff --git a/dotnet/TestClient/TestClient.csproj b/qpid/dotnet/TestClient/TestClient.csproj
similarity index 100%
rename from dotnet/TestClient/TestClient.csproj
rename to qpid/dotnet/TestClient/TestClient.csproj
diff --git a/dotnet/TestClient/default.build b/qpid/dotnet/TestClient/default.build
similarity index 100%
rename from dotnet/TestClient/default.build
rename to qpid/dotnet/TestClient/default.build
diff --git a/dotnet/TopicListener/Program.cs b/qpid/dotnet/TopicListener/Program.cs
similarity index 100%
rename from dotnet/TopicListener/Program.cs
rename to qpid/dotnet/TopicListener/Program.cs
diff --git a/dotnet/TopicListener/Properties/AssemblyInfo.cs b/qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/TopicListener/Properties/AssemblyInfo.cs
rename to qpid/dotnet/TopicListener/Properties/AssemblyInfo.cs
diff --git a/dotnet/TopicListener/TopicListener.csproj b/qpid/dotnet/TopicListener/TopicListener.csproj
similarity index 100%
rename from dotnet/TopicListener/TopicListener.csproj
rename to qpid/dotnet/TopicListener/TopicListener.csproj
diff --git a/dotnet/TopicListener/default.build b/qpid/dotnet/TopicListener/default.build
similarity index 100%
rename from dotnet/TopicListener/default.build
rename to qpid/dotnet/TopicListener/default.build
diff --git a/dotnet/TopicPublisher/Program.cs b/qpid/dotnet/TopicPublisher/Program.cs
similarity index 100%
rename from dotnet/TopicPublisher/Program.cs
rename to qpid/dotnet/TopicPublisher/Program.cs
diff --git a/dotnet/TopicPublisher/Properties/AssemblyInfo.cs b/qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/TopicPublisher/Properties/AssemblyInfo.cs
rename to qpid/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
diff --git a/dotnet/TopicPublisher/TopicPublisher.csproj b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
similarity index 100%
rename from dotnet/TopicPublisher/TopicPublisher.csproj
rename to qpid/dotnet/TopicPublisher/TopicPublisher.csproj
diff --git a/dotnet/TopicPublisher/default.build b/qpid/dotnet/TopicPublisher/default.build
similarity index 100%
rename from dotnet/TopicPublisher/default.build
rename to qpid/dotnet/TopicPublisher/default.build
diff --git a/dotnet/build-framing.bat b/qpid/dotnet/build-framing.bat
similarity index 100%
rename from dotnet/build-framing.bat
rename to qpid/dotnet/build-framing.bat
diff --git a/dotnet/build-mono b/qpid/dotnet/build-mono
similarity index 100%
rename from dotnet/build-mono
rename to qpid/dotnet/build-mono
diff --git a/dotnet/build-msbuild.bat b/qpid/dotnet/build-msbuild.bat
similarity index 100%
rename from dotnet/build-msbuild.bat
rename to qpid/dotnet/build-msbuild.bat
diff --git a/dotnet/build-nant-release b/qpid/dotnet/build-nant-release
similarity index 100%
rename from dotnet/build-nant-release
rename to qpid/dotnet/build-nant-release
diff --git a/dotnet/build-nant.bat b/qpid/dotnet/build-nant.bat
similarity index 100%
rename from dotnet/build-nant.bat
rename to qpid/dotnet/build-nant.bat
diff --git a/dotnet/client-010/App.config b/qpid/dotnet/client-010/App.config
similarity index 100%
rename from dotnet/client-010/App.config
rename to qpid/dotnet/client-010/App.config
diff --git a/dotnet/client-010/LICENSE.txt b/qpid/dotnet/client-010/LICENSE.txt
similarity index 100%
rename from dotnet/client-010/LICENSE.txt
rename to qpid/dotnet/client-010/LICENSE.txt
diff --git a/dotnet/client-010/NOTICE.txt b/qpid/dotnet/client-010/NOTICE.txt
similarity index 100%
rename from dotnet/client-010/NOTICE.txt
rename to qpid/dotnet/client-010/NOTICE.txt
diff --git a/dotnet/client-010/README.txt b/qpid/dotnet/client-010/README.txt
similarity index 100%
rename from dotnet/client-010/README.txt
rename to qpid/dotnet/client-010/README.txt
diff --git a/dotnet/client-010/addins/ExcelAddIn/Excel.exe.config b/qpid/dotnet/client-010/addins/ExcelAddIn/Excel.exe.config
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddIn/Excel.exe.config
rename to qpid/dotnet/client-010/addins/ExcelAddIn/Excel.exe.config
diff --git a/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs b/qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs
rename to qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.cs
diff --git a/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj b/qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj
rename to qpid/dotnet/client-010/addins/ExcelAddIn/ExcelAddIn.csproj
diff --git a/dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/addins/ExcelAddIn/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj
rename to qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/ExcelAddInMessageProcessor.csproj
diff --git a/dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs
rename to qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Processor.cs
diff --git a/dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/addins/ExcelAddInMessageProcessor/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj b/qpid/dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj
rename to qpid/dotnet/client-010/addins/ExcelAddInProducer/ExcelAddInProducer.csproj
diff --git a/dotnet/client-010/addins/ExcelAddInProducer/Program.cs b/qpid/dotnet/client-010/addins/ExcelAddInProducer/Program.cs
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddInProducer/Program.cs
rename to qpid/dotnet/client-010/addins/ExcelAddInProducer/Program.cs
diff --git a/dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/addins/ExcelAddInProducer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/addins/README.txt b/qpid/dotnet/client-010/addins/README.txt
similarity index 100%
rename from dotnet/client-010/addins/README.txt
rename to qpid/dotnet/client-010/addins/README.txt
diff --git a/dotnet/client-010/client/Client.csproj b/qpid/dotnet/client-010/client/Client.csproj
similarity index 100%
rename from dotnet/client-010/client/Client.csproj
rename to qpid/dotnet/client-010/client/Client.csproj
diff --git a/dotnet/client-010/client/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/client/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/client/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/client/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/client/client.sln b/qpid/dotnet/client-010/client/client.sln
similarity index 100%
rename from dotnet/client-010/client/client.sln
rename to qpid/dotnet/client-010/client/client.sln
diff --git a/dotnet/client-010/client/client.suo b/qpid/dotnet/client-010/client/client.suo
similarity index 100%
rename from dotnet/client-010/client/client.suo
rename to qpid/dotnet/client-010/client/client.suo
Binary files differ
diff --git a/dotnet/client-010/client/client/Client.cs b/qpid/dotnet/client-010/client/client/Client.cs
similarity index 100%
rename from dotnet/client-010/client/client/Client.cs
rename to qpid/dotnet/client-010/client/client/Client.cs
diff --git a/dotnet/client-010/client/client/ClientConnectionDelegate.cs b/qpid/dotnet/client-010/client/client/ClientConnectionDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/client/ClientConnectionDelegate.cs
rename to qpid/dotnet/client-010/client/client/ClientConnectionDelegate.cs
diff --git a/dotnet/client-010/client/client/ClientInterface.cs b/qpid/dotnet/client-010/client/client/ClientInterface.cs
similarity index 100%
rename from dotnet/client-010/client/client/ClientInterface.cs
rename to qpid/dotnet/client-010/client/client/ClientInterface.cs
diff --git a/dotnet/client-010/client/client/ClientSession.cs b/qpid/dotnet/client-010/client/client/ClientSession.cs
similarity index 100%
rename from dotnet/client-010/client/client/ClientSession.cs
rename to qpid/dotnet/client-010/client/client/ClientSession.cs
diff --git a/dotnet/client-010/client/client/ClientSessionDelegate.cs b/qpid/dotnet/client-010/client/client/ClientSessionDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/client/ClientSessionDelegate.cs
rename to qpid/dotnet/client-010/client/client/ClientSessionDelegate.cs
diff --git a/dotnet/client-010/client/client/ClosedListenerInterface.cs b/qpid/dotnet/client-010/client/client/ClosedListenerInterface.cs
similarity index 100%
rename from dotnet/client-010/client/client/ClosedListenerInterface.cs
rename to qpid/dotnet/client-010/client/client/ClosedListenerInterface.cs
diff --git a/dotnet/client-010/client/client/ErrorCode.cs b/qpid/dotnet/client-010/client/client/ErrorCode.cs
similarity index 100%
rename from dotnet/client-010/client/client/ErrorCode.cs
rename to qpid/dotnet/client-010/client/client/ErrorCode.cs
diff --git a/dotnet/client-010/client/client/IClient.cs b/qpid/dotnet/client-010/client/client/IClient.cs
similarity index 100%
rename from dotnet/client-010/client/client/IClient.cs
rename to qpid/dotnet/client-010/client/client/IClient.cs
diff --git a/dotnet/client-010/client/client/IClientSession.cs b/qpid/dotnet/client-010/client/client/IClientSession.cs
similarity index 100%
rename from dotnet/client-010/client/client/IClientSession.cs
rename to qpid/dotnet/client-010/client/client/IClientSession.cs
diff --git a/dotnet/client-010/client/client/IClosedListener.cs b/qpid/dotnet/client-010/client/client/IClosedListener.cs
similarity index 100%
rename from dotnet/client-010/client/client/IClosedListener.cs
rename to qpid/dotnet/client-010/client/client/IClosedListener.cs
diff --git a/dotnet/client-010/client/client/IMessage.cs b/qpid/dotnet/client-010/client/client/IMessage.cs
similarity index 100%
rename from dotnet/client-010/client/client/IMessage.cs
rename to qpid/dotnet/client-010/client/client/IMessage.cs
diff --git a/dotnet/client-010/client/client/IMessageListener.cs b/qpid/dotnet/client-010/client/client/IMessageListener.cs
similarity index 100%
rename from dotnet/client-010/client/client/IMessageListener.cs
rename to qpid/dotnet/client-010/client/client/IMessageListener.cs
diff --git a/dotnet/client-010/client/client/Message.cs b/qpid/dotnet/client-010/client/client/Message.cs
similarity index 100%
rename from dotnet/client-010/client/client/Message.cs
rename to qpid/dotnet/client-010/client/client/Message.cs
diff --git a/dotnet/client-010/client/default.build b/qpid/dotnet/client-010/client/default.build
similarity index 100%
rename from dotnet/client-010/client/default.build
rename to qpid/dotnet/client-010/client/default.build
diff --git a/dotnet/client-010/client/transport/Binary.cs b/qpid/dotnet/client-010/client/transport/Binary.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Binary.cs
rename to qpid/dotnet/client-010/client/transport/Binary.cs
diff --git a/dotnet/client-010/client/transport/Binding.cs b/qpid/dotnet/client-010/client/transport/Binding.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Binding.cs
rename to qpid/dotnet/client-010/client/transport/Binding.cs
diff --git a/dotnet/client-010/client/transport/Channel.cs b/qpid/dotnet/client-010/client/transport/Channel.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Channel.cs
rename to qpid/dotnet/client-010/client/transport/Channel.cs
diff --git a/dotnet/client-010/client/transport/ChannelDelegate.cs b/qpid/dotnet/client-010/client/transport/ChannelDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ChannelDelegate.cs
rename to qpid/dotnet/client-010/client/transport/ChannelDelegate.cs
diff --git a/dotnet/client-010/client/transport/ClientDelegate.cs b/qpid/dotnet/client-010/client/transport/ClientDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ClientDelegate.cs
rename to qpid/dotnet/client-010/client/transport/ClientDelegate.cs
diff --git a/dotnet/client-010/client/transport/Connection.cs b/qpid/dotnet/client-010/client/transport/Connection.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Connection.cs
rename to qpid/dotnet/client-010/client/transport/Connection.cs
diff --git a/dotnet/client-010/client/transport/ConnectionDelegate.cs b/qpid/dotnet/client-010/client/transport/ConnectionDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ConnectionDelegate.cs
rename to qpid/dotnet/client-010/client/transport/ConnectionDelegate.cs
diff --git a/dotnet/client-010/client/transport/Field.cs b/qpid/dotnet/client-010/client/transport/Field.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Field.cs
rename to qpid/dotnet/client-010/client/transport/Field.cs
diff --git a/dotnet/client-010/client/transport/Future.cs b/qpid/dotnet/client-010/client/transport/Future.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Future.cs
rename to qpid/dotnet/client-010/client/transport/Future.cs
diff --git a/dotnet/client-010/client/transport/Header.cs b/qpid/dotnet/client-010/client/transport/Header.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Header.cs
rename to qpid/dotnet/client-010/client/transport/Header.cs
diff --git a/dotnet/client-010/client/transport/IBinding.cs b/qpid/dotnet/client-010/client/transport/IBinding.cs
similarity index 100%
rename from dotnet/client-010/client/transport/IBinding.cs
rename to qpid/dotnet/client-010/client/transport/IBinding.cs
diff --git a/dotnet/client-010/client/transport/IFuture.cs b/qpid/dotnet/client-010/client/transport/IFuture.cs
similarity index 100%
rename from dotnet/client-010/client/transport/IFuture.cs
rename to qpid/dotnet/client-010/client/transport/IFuture.cs
diff --git a/dotnet/client-010/client/transport/IProtocolDelegate.cs b/qpid/dotnet/client-010/client/transport/IProtocolDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/IProtocolDelegate.cs
rename to qpid/dotnet/client-010/client/transport/IProtocolDelegate.cs
diff --git a/dotnet/client-010/client/transport/IProtocolEvent.cs b/qpid/dotnet/client-010/client/transport/IProtocolEvent.cs
similarity index 100%
rename from dotnet/client-010/client/transport/IProtocolEvent.cs
rename to qpid/dotnet/client-010/client/transport/IProtocolEvent.cs
diff --git a/dotnet/client-010/client/transport/IReceiver.cs b/qpid/dotnet/client-010/client/transport/IReceiver.cs
similarity index 100%
rename from dotnet/client-010/client/transport/IReceiver.cs
rename to qpid/dotnet/client-010/client/transport/IReceiver.cs
diff --git a/dotnet/client-010/client/transport/ISender.cs b/qpid/dotnet/client-010/client/transport/ISender.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ISender.cs
rename to qpid/dotnet/client-010/client/transport/ISender.cs
diff --git a/dotnet/client-010/client/transport/ISession.cs b/qpid/dotnet/client-010/client/transport/ISession.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ISession.cs
rename to qpid/dotnet/client-010/client/transport/ISession.cs
diff --git a/dotnet/client-010/client/transport/Method.cs b/qpid/dotnet/client-010/client/transport/Method.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Method.cs
rename to qpid/dotnet/client-010/client/transport/Method.cs
diff --git a/dotnet/client-010/client/transport/ProtocolDelegate.cs b/qpid/dotnet/client-010/client/transport/ProtocolDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ProtocolDelegate.cs
rename to qpid/dotnet/client-010/client/transport/ProtocolDelegate.cs
diff --git a/dotnet/client-010/client/transport/ProtocolError.cs b/qpid/dotnet/client-010/client/transport/ProtocolError.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ProtocolError.cs
rename to qpid/dotnet/client-010/client/transport/ProtocolError.cs
diff --git a/dotnet/client-010/client/transport/ProtocolEvent.cs b/qpid/dotnet/client-010/client/transport/ProtocolEvent.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ProtocolEvent.cs
rename to qpid/dotnet/client-010/client/transport/ProtocolEvent.cs
diff --git a/dotnet/client-010/client/transport/ProtocolHeader.cs b/qpid/dotnet/client-010/client/transport/ProtocolHeader.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ProtocolHeader.cs
rename to qpid/dotnet/client-010/client/transport/ProtocolHeader.cs
diff --git a/dotnet/client-010/client/transport/Range.cs b/qpid/dotnet/client-010/client/transport/Range.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Range.cs
rename to qpid/dotnet/client-010/client/transport/Range.cs
diff --git a/dotnet/client-010/client/transport/RangeSet.cs b/qpid/dotnet/client-010/client/transport/RangeSet.cs
similarity index 100%
rename from dotnet/client-010/client/transport/RangeSet.cs
rename to qpid/dotnet/client-010/client/transport/RangeSet.cs
diff --git a/dotnet/client-010/client/transport/ReceivedPayload.cs b/qpid/dotnet/client-010/client/transport/ReceivedPayload.cs
similarity index 100%
rename from dotnet/client-010/client/transport/ReceivedPayload.cs
rename to qpid/dotnet/client-010/client/transport/ReceivedPayload.cs
diff --git a/dotnet/client-010/client/transport/Receiver.cs b/qpid/dotnet/client-010/client/transport/Receiver.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Receiver.cs
rename to qpid/dotnet/client-010/client/transport/Receiver.cs
diff --git a/dotnet/client-010/client/transport/Sender.cs b/qpid/dotnet/client-010/client/transport/Sender.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Sender.cs
rename to qpid/dotnet/client-010/client/transport/Sender.cs
diff --git a/dotnet/client-010/client/transport/Session.cs b/qpid/dotnet/client-010/client/transport/Session.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Session.cs
rename to qpid/dotnet/client-010/client/transport/Session.cs
diff --git a/dotnet/client-010/client/transport/SessionDelegate.cs b/qpid/dotnet/client-010/client/transport/SessionDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/SessionDelegate.cs
rename to qpid/dotnet/client-010/client/transport/SessionDelegate.cs
diff --git a/dotnet/client-010/client/transport/Struct.cs b/qpid/dotnet/client-010/client/transport/Struct.cs
similarity index 100%
rename from dotnet/client-010/client/transport/Struct.cs
rename to qpid/dotnet/client-010/client/transport/Struct.cs
diff --git a/dotnet/client-010/client/transport/codec/AbstractDecoder.cs b/qpid/dotnet/client-010/client/transport/codec/AbstractDecoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/AbstractDecoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/AbstractDecoder.cs
diff --git a/dotnet/client-010/client/transport/codec/AbstractEncoder.cs b/qpid/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/AbstractEncoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
diff --git a/dotnet/client-010/client/transport/codec/Decoder.cs b/qpid/dotnet/client-010/client/transport/codec/Decoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/Decoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/Decoder.cs
diff --git a/dotnet/client-010/client/transport/codec/Encodable.cs b/qpid/dotnet/client-010/client/transport/codec/Encodable.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/Encodable.cs
rename to qpid/dotnet/client-010/client/transport/codec/Encodable.cs
diff --git a/dotnet/client-010/client/transport/codec/Encoder.cs b/qpid/dotnet/client-010/client/transport/codec/Encoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/Encoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/Encoder.cs
diff --git a/dotnet/client-010/client/transport/codec/IDecoder.cs b/qpid/dotnet/client-010/client/transport/codec/IDecoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/IDecoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/IDecoder.cs
diff --git a/dotnet/client-010/client/transport/codec/IEncodable.cs b/qpid/dotnet/client-010/client/transport/codec/IEncodable.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/IEncodable.cs
rename to qpid/dotnet/client-010/client/transport/codec/IEncodable.cs
diff --git a/dotnet/client-010/client/transport/codec/IEncoder.cs b/qpid/dotnet/client-010/client/transport/codec/IEncoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/IEncoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/IEncoder.cs
diff --git a/dotnet/client-010/client/transport/codec/MSDecoder.cs b/qpid/dotnet/client-010/client/transport/codec/MSDecoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/MSDecoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/MSDecoder.cs
diff --git a/dotnet/client-010/client/transport/codec/MSEncoder.cs b/qpid/dotnet/client-010/client/transport/codec/MSEncoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/codec/MSEncoder.cs
rename to qpid/dotnet/client-010/client/transport/codec/MSEncoder.cs
diff --git a/dotnet/client-010/client/transport/exception/ConnectionException.cs b/qpid/dotnet/client-010/client/transport/exception/ConnectionException.cs
similarity index 100%
rename from dotnet/client-010/client/transport/exception/ConnectionException.cs
rename to qpid/dotnet/client-010/client/transport/exception/ConnectionException.cs
diff --git a/dotnet/client-010/client/transport/exception/ExceptionArgs.cs b/qpid/dotnet/client-010/client/transport/exception/ExceptionArgs.cs
similarity index 100%
rename from dotnet/client-010/client/transport/exception/ExceptionArgs.cs
rename to qpid/dotnet/client-010/client/transport/exception/ExceptionArgs.cs
diff --git a/dotnet/client-010/client/transport/exception/ProtocolVersionException.cs b/qpid/dotnet/client-010/client/transport/exception/ProtocolVersionException.cs
similarity index 100%
rename from dotnet/client-010/client/transport/exception/ProtocolVersionException.cs
rename to qpid/dotnet/client-010/client/transport/exception/ProtocolVersionException.cs
diff --git a/dotnet/client-010/client/transport/exception/SessionClosedException.cs b/qpid/dotnet/client-010/client/transport/exception/SessionClosedException.cs
similarity index 100%
rename from dotnet/client-010/client/transport/exception/SessionClosedException.cs
rename to qpid/dotnet/client-010/client/transport/exception/SessionClosedException.cs
diff --git a/dotnet/client-010/client/transport/exception/SessionException.cs b/qpid/dotnet/client-010/client/transport/exception/SessionException.cs
similarity index 100%
rename from dotnet/client-010/client/transport/exception/SessionException.cs
rename to qpid/dotnet/client-010/client/transport/exception/SessionException.cs
diff --git a/dotnet/client-010/client/transport/exception/TransportException.cs b/qpid/dotnet/client-010/client/transport/exception/TransportException.cs
similarity index 100%
rename from dotnet/client-010/client/transport/exception/TransportException.cs
rename to qpid/dotnet/client-010/client/transport/exception/TransportException.cs
diff --git a/dotnet/client-010/client/transport/network/Assembler.cs b/qpid/dotnet/client-010/client/transport/network/Assembler.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/Assembler.cs
rename to qpid/dotnet/client-010/client/transport/network/Assembler.cs
diff --git a/dotnet/client-010/client/transport/network/Disassembler.cs b/qpid/dotnet/client-010/client/transport/network/Disassembler.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/Disassembler.cs
rename to qpid/dotnet/client-010/client/transport/network/Disassembler.cs
diff --git a/dotnet/client-010/client/transport/network/Frame.cs b/qpid/dotnet/client-010/client/transport/network/Frame.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/Frame.cs
rename to qpid/dotnet/client-010/client/transport/network/Frame.cs
diff --git a/dotnet/client-010/client/transport/network/IIoSender.cs b/qpid/dotnet/client-010/client/transport/network/IIoSender.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/IIoSender.cs
rename to qpid/dotnet/client-010/client/transport/network/IIoSender.cs
diff --git a/dotnet/client-010/client/transport/network/INetworkDelegate.cs b/qpid/dotnet/client-010/client/transport/network/INetworkDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/INetworkDelegate.cs
rename to qpid/dotnet/client-010/client/transport/network/INetworkDelegate.cs
diff --git a/dotnet/client-010/client/transport/network/INetworkEvent.cs b/qpid/dotnet/client-010/client/transport/network/INetworkEvent.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/INetworkEvent.cs
rename to qpid/dotnet/client-010/client/transport/network/INetworkEvent.cs
diff --git a/dotnet/client-010/client/transport/network/InputHandler.cs b/qpid/dotnet/client-010/client/transport/network/InputHandler.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/InputHandler.cs
rename to qpid/dotnet/client-010/client/transport/network/InputHandler.cs
diff --git a/dotnet/client-010/client/transport/network/NetworkDelegate.cs b/qpid/dotnet/client-010/client/transport/network/NetworkDelegate.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/NetworkDelegate.cs
rename to qpid/dotnet/client-010/client/transport/network/NetworkDelegate.cs
diff --git a/dotnet/client-010/client/transport/network/NetworkEvent.cs b/qpid/dotnet/client-010/client/transport/network/NetworkEvent.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/NetworkEvent.cs
rename to qpid/dotnet/client-010/client/transport/network/NetworkEvent.cs
diff --git a/dotnet/client-010/client/transport/network/io/IIoSender.cs b/qpid/dotnet/client-010/client/transport/network/io/IIoSender.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/io/IIoSender.cs
rename to qpid/dotnet/client-010/client/transport/network/io/IIoSender.cs
diff --git a/dotnet/client-010/client/transport/network/io/IIoTransport.cs b/qpid/dotnet/client-010/client/transport/network/io/IIoTransport.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/io/IIoTransport.cs
rename to qpid/dotnet/client-010/client/transport/network/io/IIoTransport.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoReceiver.cs b/qpid/dotnet/client-010/client/transport/network/io/IoReceiver.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/io/IoReceiver.cs
rename to qpid/dotnet/client-010/client/transport/network/io/IoReceiver.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoSSLTransport.cs b/qpid/dotnet/client-010/client/transport/network/io/IoSSLTransport.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/io/IoSSLTransport.cs
rename to qpid/dotnet/client-010/client/transport/network/io/IoSSLTransport.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoSender.cs b/qpid/dotnet/client-010/client/transport/network/io/IoSender.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/io/IoSender.cs
rename to qpid/dotnet/client-010/client/transport/network/io/IoSender.cs
diff --git a/dotnet/client-010/client/transport/network/io/IoTransport.cs b/qpid/dotnet/client-010/client/transport/network/io/IoTransport.cs
similarity index 100%
rename from dotnet/client-010/client/transport/network/io/IoTransport.cs
rename to qpid/dotnet/client-010/client/transport/network/io/IoTransport.cs
diff --git a/dotnet/client-010/client/transport/util/ByteEncoder.cs b/qpid/dotnet/client-010/client/transport/util/ByteEncoder.cs
similarity index 100%
rename from dotnet/client-010/client/transport/util/ByteEncoder.cs
rename to qpid/dotnet/client-010/client/transport/util/ByteEncoder.cs
diff --git a/dotnet/client-010/client/transport/util/CircularBuffer.cs b/qpid/dotnet/client-010/client/transport/util/CircularBuffer.cs
similarity index 100%
rename from dotnet/client-010/client/transport/util/CircularBuffer.cs
rename to qpid/dotnet/client-010/client/transport/util/CircularBuffer.cs
diff --git a/dotnet/client-010/client/transport/util/Functions.cs b/qpid/dotnet/client-010/client/transport/util/Functions.cs
similarity index 100%
rename from dotnet/client-010/client/transport/util/Functions.cs
rename to qpid/dotnet/client-010/client/transport/util/Functions.cs
diff --git a/dotnet/client-010/client/transport/util/Logger.cs b/qpid/dotnet/client-010/client/transport/util/Logger.cs
similarity index 100%
rename from dotnet/client-010/client/transport/util/Logger.cs
rename to qpid/dotnet/client-010/client/transport/util/Logger.cs
diff --git a/dotnet/client-010/client/transport/util/ResultFuture.cs b/qpid/dotnet/client-010/client/transport/util/ResultFuture.cs
similarity index 100%
rename from dotnet/client-010/client/transport/util/ResultFuture.cs
rename to qpid/dotnet/client-010/client/transport/util/ResultFuture.cs
diff --git a/dotnet/client-010/client/transport/util/Serial.cs b/qpid/dotnet/client-010/client/transport/util/Serial.cs
similarity index 100%
rename from dotnet/client-010/client/transport/util/Serial.cs
rename to qpid/dotnet/client-010/client/transport/util/Serial.cs
diff --git a/dotnet/client-010/client/transport/util/UUID.cs b/qpid/dotnet/client-010/client/transport/util/UUID.cs
similarity index 100%
rename from dotnet/client-010/client/transport/util/UUID.cs
rename to qpid/dotnet/client-010/client/transport/util/UUID.cs
diff --git a/dotnet/client-010/default.build b/qpid/dotnet/client-010/default.build
similarity index 100%
rename from dotnet/client-010/default.build
rename to qpid/dotnet/client-010/default.build
diff --git a/dotnet/client-010/demo/Demo.csproj b/qpid/dotnet/client-010/demo/Demo.csproj
similarity index 100%
rename from dotnet/client-010/demo/Demo.csproj
rename to qpid/dotnet/client-010/demo/Demo.csproj
diff --git a/dotnet/client-010/demo/Program.cs b/qpid/dotnet/client-010/demo/Program.cs
similarity index 100%
rename from dotnet/client-010/demo/Program.cs
rename to qpid/dotnet/client-010/demo/Program.cs
diff --git a/dotnet/client-010/demo/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/demo/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/demo/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/demo/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/demo/Properties/Resources.Designer.cs b/qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs
similarity index 100%
rename from dotnet/client-010/demo/Properties/Resources.Designer.cs
rename to qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs
diff --git a/dotnet/client-010/demo/Properties/Resources.resx b/qpid/dotnet/client-010/demo/Properties/Resources.resx
similarity index 100%
rename from dotnet/client-010/demo/Properties/Resources.resx
rename to qpid/dotnet/client-010/demo/Properties/Resources.resx
diff --git a/dotnet/client-010/demo/Properties/Settings.Designer.cs b/qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs
similarity index 100%
rename from dotnet/client-010/demo/Properties/Settings.Designer.cs
rename to qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs
diff --git a/dotnet/client-010/demo/Properties/Settings.settings b/qpid/dotnet/client-010/demo/Properties/Settings.settings
similarity index 100%
rename from dotnet/client-010/demo/Properties/Settings.settings
rename to qpid/dotnet/client-010/demo/Properties/Settings.settings
diff --git a/dotnet/client-010/demo/default.build b/qpid/dotnet/client-010/demo/default.build
similarity index 100%
rename from dotnet/client-010/demo/default.build
rename to qpid/dotnet/client-010/demo/default.build
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs
rename to qpid/dotnet/client-010/examples/direct/example-direct-Listener/Listener.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/direct/example-direct-Listener/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/default.build b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-Listener/default.build
rename to qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build
diff --git a/dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj
rename to qpid/dotnet/client-010/examples/direct/example-direct-Listener/example-direct-Listener.csproj
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/Producer.cs b/qpid/dotnet/client-010/examples/direct/example-direct-producer/Producer.cs
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-producer/Producer.cs
rename to qpid/dotnet/client-010/examples/direct/example-direct-producer/Producer.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/direct/example-direct-producer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/default.build b/qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-producer/default.build
rename to qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build
diff --git a/dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj b/qpid/dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj
similarity index 100%
rename from dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj
rename to qpid/dotnet/client-010/examples/direct/example-direct-producer/example-direct-producer.csproj
diff --git a/dotnet/client-010/examples/direct/verify b/qpid/dotnet/client-010/examples/direct/verify
similarity index 100%
rename from dotnet/client-010/examples/direct/verify
rename to qpid/dotnet/client-010/examples/direct/verify
diff --git a/dotnet/client-010/examples/direct/verify.in b/qpid/dotnet/client-010/examples/direct/verify.in
similarity index 100%
rename from dotnet/client-010/examples/direct/verify.in
rename to qpid/dotnet/client-010/examples/direct/verify.in
diff --git a/dotnet/client-010/examples/direct/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet
similarity index 100%
rename from dotnet/client-010/examples/direct/verify_cpp_dotnet
rename to qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/direct/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
similarity index 100%
rename from dotnet/client-010/examples/direct/verify_cpp_dotnet.in
rename to qpid/dotnet/client-010/examples/direct/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/direct/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp
similarity index 100%
rename from dotnet/client-010/examples/direct/verify_dotnet_cpp
rename to qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/direct/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
similarity index 100%
rename from dotnet/client-010/examples/direct/verify_dotnet_cpp.in
rename to qpid/dotnet/client-010/examples/direct/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Listener.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/example-fanout-Listener.csproj
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Producer.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
diff --git a/dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj
similarity index 100%
rename from dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj
rename to qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/example-fanout-Producer.csproj
diff --git a/dotnet/client-010/examples/fanout/verify b/qpid/dotnet/client-010/examples/fanout/verify
similarity index 100%
rename from dotnet/client-010/examples/fanout/verify
rename to qpid/dotnet/client-010/examples/fanout/verify
diff --git a/dotnet/client-010/examples/fanout/verify.in b/qpid/dotnet/client-010/examples/fanout/verify.in
similarity index 100%
rename from dotnet/client-010/examples/fanout/verify.in
rename to qpid/dotnet/client-010/examples/fanout/verify.in
diff --git a/dotnet/client-010/examples/fanout/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet
similarity index 100%
rename from dotnet/client-010/examples/fanout/verify_cpp_dotnet
rename to qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
similarity index 100%
rename from dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
rename to qpid/dotnet/client-010/examples/fanout/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/fanout/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp
similarity index 100%
rename from dotnet/client-010/examples/fanout/verify_dotnet_cpp
rename to qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
similarity index 100%
rename from dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
rename to qpid/dotnet/client-010/examples/fanout/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Listener.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/example-pub-sub-Listener.csproj
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/Publisher.cs
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
diff --git a/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj
rename to qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/example-pub-sub-Publisher.csproj
diff --git a/dotnet/client-010/examples/pub-sub/verify b/qpid/dotnet/client-010/examples/pub-sub/verify
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/verify
rename to qpid/dotnet/client-010/examples/pub-sub/verify
diff --git a/dotnet/client-010/examples/pub-sub/verify.in b/qpid/dotnet/client-010/examples/pub-sub/verify.in
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/verify.in
rename to qpid/dotnet/client-010/examples/pub-sub/verify.in
diff --git a/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/verify_cpp_dotnet
rename to qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
rename to qpid/dotnet/client-010/examples/pub-sub/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/verify_dotnet_cpp
rename to qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
similarity index 100%
rename from dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
rename to qpid/dotnet/client-010/examples/pub-sub/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Client/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Client/RequestResponseClient.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/default.build b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Client/default.build
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Client/example-request-response-Client.csproj
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Server/Server.cs
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/default.build b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Server/default.build
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
diff --git a/dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj
similarity index 100%
rename from dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj
rename to qpid/dotnet/client-010/examples/request-response/example-request-response-Server/example-request-response-Server.csproj
diff --git a/dotnet/client-010/examples/request-response/verify b/qpid/dotnet/client-010/examples/request-response/verify
similarity index 100%
rename from dotnet/client-010/examples/request-response/verify
rename to qpid/dotnet/client-010/examples/request-response/verify
diff --git a/dotnet/client-010/examples/request-response/verify.in b/qpid/dotnet/client-010/examples/request-response/verify.in
similarity index 100%
rename from dotnet/client-010/examples/request-response/verify.in
rename to qpid/dotnet/client-010/examples/request-response/verify.in
diff --git a/dotnet/client-010/examples/request-response/verify_cpp_dotnet b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet
similarity index 100%
rename from dotnet/client-010/examples/request-response/verify_cpp_dotnet
rename to qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet
diff --git a/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in b/qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
similarity index 100%
rename from dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
rename to qpid/dotnet/client-010/examples/request-response/verify_cpp_dotnet.in
diff --git a/dotnet/client-010/examples/request-response/verify_dotnet_cpp b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp
similarity index 100%
rename from dotnet/client-010/examples/request-response/verify_dotnet_cpp
rename to qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp
diff --git a/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in b/qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
similarity index 100%
rename from dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
rename to qpid/dotnet/client-010/examples/request-response/verify_dotnet_cpp.in
diff --git a/dotnet/client-010/gentool/Composite.tpl b/qpid/dotnet/client-010/gentool/Composite.tpl
similarity index 100%
rename from dotnet/client-010/gentool/Composite.tpl
rename to qpid/dotnet/client-010/gentool/Composite.tpl
diff --git a/dotnet/client-010/gentool/Constant.tpl b/qpid/dotnet/client-010/gentool/Constant.tpl
similarity index 100%
rename from dotnet/client-010/gentool/Constant.tpl
rename to qpid/dotnet/client-010/gentool/Constant.tpl
diff --git a/dotnet/client-010/gentool/Enum.tpl b/qpid/dotnet/client-010/gentool/Enum.tpl
similarity index 100%
rename from dotnet/client-010/gentool/Enum.tpl
rename to qpid/dotnet/client-010/gentool/Enum.tpl
diff --git a/dotnet/client-010/gentool/IInvoker.tpl b/qpid/dotnet/client-010/gentool/IInvoker.tpl
similarity index 100%
rename from dotnet/client-010/gentool/IInvoker.tpl
rename to qpid/dotnet/client-010/gentool/IInvoker.tpl
diff --git a/dotnet/client-010/gentool/Invoker.tpl b/qpid/dotnet/client-010/gentool/Invoker.tpl
similarity index 100%
rename from dotnet/client-010/gentool/Invoker.tpl
rename to qpid/dotnet/client-010/gentool/Invoker.tpl
diff --git a/dotnet/client-010/gentool/MethodDelegate.tpl b/qpid/dotnet/client-010/gentool/MethodDelegate.tpl
similarity index 100%
rename from dotnet/client-010/gentool/MethodDelegate.tpl
rename to qpid/dotnet/client-010/gentool/MethodDelegate.tpl
diff --git a/dotnet/client-010/gentool/Option.tpl b/qpid/dotnet/client-010/gentool/Option.tpl
similarity index 100%
rename from dotnet/client-010/gentool/Option.tpl
rename to qpid/dotnet/client-010/gentool/Option.tpl
diff --git a/dotnet/client-010/gentool/StructFactory.tpl b/qpid/dotnet/client-010/gentool/StructFactory.tpl
similarity index 100%
rename from dotnet/client-010/gentool/StructFactory.tpl
rename to qpid/dotnet/client-010/gentool/StructFactory.tpl
diff --git a/dotnet/client-010/gentool/Type.tpl b/qpid/dotnet/client-010/gentool/Type.tpl
similarity index 100%
rename from dotnet/client-010/gentool/Type.tpl
rename to qpid/dotnet/client-010/gentool/Type.tpl
diff --git a/dotnet/client-010/gentool/build.xml b/qpid/dotnet/client-010/gentool/build.xml
similarity index 100%
rename from dotnet/client-010/gentool/build.xml
rename to qpid/dotnet/client-010/gentool/build.xml
diff --git a/dotnet/client-010/gentool/codegen b/qpid/dotnet/client-010/gentool/codegen
similarity index 100%
rename from dotnet/client-010/gentool/codegen
rename to qpid/dotnet/client-010/gentool/codegen
diff --git a/dotnet/client-010/gentool/dotnetgenutil.py b/qpid/dotnet/client-010/gentool/dotnetgenutil.py
similarity index 100%
rename from dotnet/client-010/gentool/dotnetgenutil.py
rename to qpid/dotnet/client-010/gentool/dotnetgenutil.py
diff --git a/dotnet/client-010/lib/log4net/log4net-licence.txt b/qpid/dotnet/client-010/lib/log4net/log4net-licence.txt
similarity index 100%
rename from dotnet/client-010/lib/log4net/log4net-licence.txt
rename to qpid/dotnet/client-010/lib/log4net/log4net-licence.txt
diff --git a/dotnet/client-010/lib/log4net/log4net.dll b/qpid/dotnet/client-010/lib/log4net/log4net.dll
similarity index 100%
rename from dotnet/client-010/lib/log4net/log4net.dll
rename to qpid/dotnet/client-010/lib/log4net/log4net.dll
Binary files differ
diff --git a/dotnet/client-010/lib/log4net/log4net.xml b/qpid/dotnet/client-010/lib/log4net/log4net.xml
similarity index 100%
rename from dotnet/client-010/lib/log4net/log4net.xml
rename to qpid/dotnet/client-010/lib/log4net/log4net.xml
diff --git a/dotnet/client-010/lib/nunit/nunit-licence.txt b/qpid/dotnet/client-010/lib/nunit/nunit-licence.txt
similarity index 100%
rename from dotnet/client-010/lib/nunit/nunit-licence.txt
rename to qpid/dotnet/client-010/lib/nunit/nunit-licence.txt
diff --git a/dotnet/client-010/lib/nunit/nunit.framework.dll b/qpid/dotnet/client-010/lib/nunit/nunit.framework.dll
similarity index 100%
rename from dotnet/client-010/lib/nunit/nunit.framework.dll
rename to qpid/dotnet/client-010/lib/nunit/nunit.framework.dll
Binary files differ
diff --git a/dotnet/client-010/lib/plossum/C5-License.txt b/qpid/dotnet/client-010/lib/plossum/C5-License.txt
similarity index 100%
rename from dotnet/client-010/lib/plossum/C5-License.txt
rename to qpid/dotnet/client-010/lib/plossum/C5-License.txt
diff --git a/dotnet/client-010/lib/plossum/C5.dll b/qpid/dotnet/client-010/lib/plossum/C5.dll
similarity index 100%
rename from dotnet/client-010/lib/plossum/C5.dll
rename to qpid/dotnet/client-010/lib/plossum/C5.dll
Binary files differ
diff --git a/dotnet/client-010/lib/plossum/Plossum CommandLine.dll b/qpid/dotnet/client-010/lib/plossum/Plossum CommandLine.dll
similarity index 100%
rename from dotnet/client-010/lib/plossum/Plossum CommandLine.dll
rename to qpid/dotnet/client-010/lib/plossum/Plossum CommandLine.dll
Binary files differ
diff --git a/dotnet/client-010/lib/plossum/license.txt b/qpid/dotnet/client-010/lib/plossum/license.txt
similarity index 100%
rename from dotnet/client-010/lib/plossum/license.txt
rename to qpid/dotnet/client-010/lib/plossum/license.txt
diff --git a/dotnet/client-010/log.xml b/qpid/dotnet/client-010/log.xml
similarity index 100%
rename from dotnet/client-010/log.xml
rename to qpid/dotnet/client-010/log.xml
diff --git a/dotnet/client-010/management/console/AbstractConsole.cs b/qpid/dotnet/client-010/management/console/AbstractConsole.cs
similarity index 100%
rename from dotnet/client-010/management/console/AbstractConsole.cs
rename to qpid/dotnet/client-010/management/console/AbstractConsole.cs
diff --git a/dotnet/client-010/management/console/Agent.cs b/qpid/dotnet/client-010/management/console/Agent.cs
similarity index 100%
rename from dotnet/client-010/management/console/Agent.cs
rename to qpid/dotnet/client-010/management/console/Agent.cs
diff --git a/dotnet/client-010/management/console/Broker.cs b/qpid/dotnet/client-010/management/console/Broker.cs
similarity index 100%
rename from dotnet/client-010/management/console/Broker.cs
rename to qpid/dotnet/client-010/management/console/Broker.cs
diff --git a/dotnet/client-010/management/console/BrokerURL.cs b/qpid/dotnet/client-010/management/console/BrokerURL.cs
similarity index 100%
rename from dotnet/client-010/management/console/BrokerURL.cs
rename to qpid/dotnet/client-010/management/console/BrokerURL.cs
diff --git a/dotnet/client-010/management/console/ClassKey.cs b/qpid/dotnet/client-010/management/console/ClassKey.cs
similarity index 100%
rename from dotnet/client-010/management/console/ClassKey.cs
rename to qpid/dotnet/client-010/management/console/ClassKey.cs
diff --git a/dotnet/client-010/management/console/Console.cs b/qpid/dotnet/client-010/management/console/Console.cs
similarity index 100%
rename from dotnet/client-010/management/console/Console.cs
rename to qpid/dotnet/client-010/management/console/Console.cs
diff --git a/dotnet/client-010/management/console/MethodResult.cs b/qpid/dotnet/client-010/management/console/MethodResult.cs
similarity index 100%
rename from dotnet/client-010/management/console/MethodResult.cs
rename to qpid/dotnet/client-010/management/console/MethodResult.cs
diff --git a/dotnet/client-010/management/console/ObjectID.cs b/qpid/dotnet/client-010/management/console/ObjectID.cs
similarity index 100%
rename from dotnet/client-010/management/console/ObjectID.cs
rename to qpid/dotnet/client-010/management/console/ObjectID.cs
diff --git a/dotnet/client-010/management/console/QMFEvent.cs b/qpid/dotnet/client-010/management/console/QMFEvent.cs
similarity index 100%
rename from dotnet/client-010/management/console/QMFEvent.cs
rename to qpid/dotnet/client-010/management/console/QMFEvent.cs
diff --git a/dotnet/client-010/management/console/QMFObject.cs b/qpid/dotnet/client-010/management/console/QMFObject.cs
similarity index 100%
rename from dotnet/client-010/management/console/QMFObject.cs
rename to qpid/dotnet/client-010/management/console/QMFObject.cs
diff --git a/dotnet/client-010/management/console/SchemaArgument.cs b/qpid/dotnet/client-010/management/console/SchemaArgument.cs
similarity index 100%
rename from dotnet/client-010/management/console/SchemaArgument.cs
rename to qpid/dotnet/client-010/management/console/SchemaArgument.cs
diff --git a/dotnet/client-010/management/console/SchemaClass.cs b/qpid/dotnet/client-010/management/console/SchemaClass.cs
similarity index 100%
rename from dotnet/client-010/management/console/SchemaClass.cs
rename to qpid/dotnet/client-010/management/console/SchemaClass.cs
diff --git a/dotnet/client-010/management/console/SchemaMethod.cs b/qpid/dotnet/client-010/management/console/SchemaMethod.cs
similarity index 100%
rename from dotnet/client-010/management/console/SchemaMethod.cs
rename to qpid/dotnet/client-010/management/console/SchemaMethod.cs
diff --git a/dotnet/client-010/management/console/SchemaProperty.cs b/qpid/dotnet/client-010/management/console/SchemaProperty.cs
similarity index 100%
rename from dotnet/client-010/management/console/SchemaProperty.cs
rename to qpid/dotnet/client-010/management/console/SchemaProperty.cs
diff --git a/dotnet/client-010/management/console/SchemaStatistic.cs b/qpid/dotnet/client-010/management/console/SchemaStatistic.cs
similarity index 100%
rename from dotnet/client-010/management/console/SchemaStatistic.cs
rename to qpid/dotnet/client-010/management/console/SchemaStatistic.cs
diff --git a/dotnet/client-010/management/console/SchemaVariable.cs b/qpid/dotnet/client-010/management/console/SchemaVariable.cs
similarity index 100%
rename from dotnet/client-010/management/console/SchemaVariable.cs
rename to qpid/dotnet/client-010/management/console/SchemaVariable.cs
diff --git a/dotnet/client-010/management/console/SequenceManager.cs b/qpid/dotnet/client-010/management/console/SequenceManager.cs
similarity index 100%
rename from dotnet/client-010/management/console/SequenceManager.cs
rename to qpid/dotnet/client-010/management/console/SequenceManager.cs
diff --git a/dotnet/client-010/management/console/Session.cs b/qpid/dotnet/client-010/management/console/Session.cs
similarity index 100%
rename from dotnet/client-010/management/console/Session.cs
rename to qpid/dotnet/client-010/management/console/Session.cs
diff --git a/dotnet/client-010/management/console/Util.cs b/qpid/dotnet/client-010/management/console/Util.cs
similarity index 100%
rename from dotnet/client-010/management/console/Util.cs
rename to qpid/dotnet/client-010/management/console/Util.cs
diff --git a/dotnet/client-010/management/console/XMLUtil.cs b/qpid/dotnet/client-010/management/console/XMLUtil.cs
similarity index 100%
rename from dotnet/client-010/management/console/XMLUtil.cs
rename to qpid/dotnet/client-010/management/console/XMLUtil.cs
diff --git a/dotnet/client-010/management/console/console.csproj b/qpid/dotnet/client-010/management/console/console.csproj
similarity index 100%
rename from dotnet/client-010/management/console/console.csproj
rename to qpid/dotnet/client-010/management/console/console.csproj
diff --git a/dotnet/client-010/management/console/console.sln b/qpid/dotnet/client-010/management/console/console.sln
similarity index 100%
rename from dotnet/client-010/management/console/console.sln
rename to qpid/dotnet/client-010/management/console/console.sln
diff --git a/dotnet/client-010/management/console/default.build b/qpid/dotnet/client-010/management/console/default.build
similarity index 100%
rename from dotnet/client-010/management/console/default.build
rename to qpid/dotnet/client-010/management/console/default.build
diff --git a/dotnet/client-010/perftest/PerfTest.cs b/qpid/dotnet/client-010/perftest/PerfTest.cs
similarity index 100%
rename from dotnet/client-010/perftest/PerfTest.cs
rename to qpid/dotnet/client-010/perftest/PerfTest.cs
diff --git a/dotnet/client-010/perftest/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/perftest/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/perftest/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/perftest/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/perftest/README.txt b/qpid/dotnet/client-010/perftest/README.txt
similarity index 100%
rename from dotnet/client-010/perftest/README.txt
rename to qpid/dotnet/client-010/perftest/README.txt
diff --git a/dotnet/client-010/perftest/default.build b/qpid/dotnet/client-010/perftest/default.build
similarity index 100%
rename from dotnet/client-010/perftest/default.build
rename to qpid/dotnet/client-010/perftest/default.build
diff --git a/dotnet/client-010/perftest/perftest.csproj b/qpid/dotnet/client-010/perftest/perftest.csproj
similarity index 100%
rename from dotnet/client-010/perftest/perftest.csproj
rename to qpid/dotnet/client-010/perftest/perftest.csproj
diff --git a/dotnet/client-010/test/Helpers/ConfigHelpers.cs b/qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs
similarity index 100%
rename from dotnet/client-010/test/Helpers/ConfigHelpers.cs
rename to qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs
diff --git a/dotnet/client-010/test/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/test/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/test/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/test/Qpid Test.dll.config b/qpid/dotnet/client-010/test/Qpid Test.dll.config
similarity index 100%
rename from dotnet/client-010/test/Qpid Test.dll.config
rename to qpid/dotnet/client-010/test/Qpid Test.dll.config
diff --git a/dotnet/client-010/test/Test.csproj b/qpid/dotnet/client-010/test/Test.csproj
similarity index 100%
rename from dotnet/client-010/test/Test.csproj
rename to qpid/dotnet/client-010/test/Test.csproj
diff --git a/dotnet/client-010/test/default.build b/qpid/dotnet/client-010/test/default.build
similarity index 100%
rename from dotnet/client-010/test/default.build
rename to qpid/dotnet/client-010/test/default.build
diff --git a/dotnet/client-010/test/interop/Admin.cs b/qpid/dotnet/client-010/test/interop/Admin.cs
similarity index 100%
rename from dotnet/client-010/test/interop/Admin.cs
rename to qpid/dotnet/client-010/test/interop/Admin.cs
diff --git a/dotnet/client-010/test/interop/ApplicationHeaders.cs b/qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs
similarity index 100%
rename from dotnet/client-010/test/interop/ApplicationHeaders.cs
rename to qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs
diff --git a/dotnet/client-010/test/interop/ConnectionTests.cs b/qpid/dotnet/client-010/test/interop/ConnectionTests.cs
similarity index 100%
rename from dotnet/client-010/test/interop/ConnectionTests.cs
rename to qpid/dotnet/client-010/test/interop/ConnectionTests.cs
diff --git a/dotnet/client-010/test/interop/Message.cs b/qpid/dotnet/client-010/test/interop/Message.cs
similarity index 100%
rename from dotnet/client-010/test/interop/Message.cs
rename to qpid/dotnet/client-010/test/interop/Message.cs
diff --git a/dotnet/client-010/test/interop/TestCase.cs b/qpid/dotnet/client-010/test/interop/TestCase.cs
similarity index 100%
rename from dotnet/client-010/test/interop/TestCase.cs
rename to qpid/dotnet/client-010/test/interop/TestCase.cs
diff --git a/dotnet/client-010/test/transport/util/ByteEncoderTest.cs b/qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs
similarity index 100%
rename from dotnet/client-010/test/transport/util/ByteEncoderTest.cs
rename to qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs
diff --git a/dotnet/client-010/test/transport/util/CircularBufferTest.cs b/qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs
similarity index 100%
rename from dotnet/client-010/test/transport/util/CircularBufferTest.cs
rename to qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs
diff --git a/dotnet/client-010/test/transport/util/ResultFutureTest.cs b/qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs
similarity index 100%
rename from dotnet/client-010/test/transport/util/ResultFutureTest.cs
rename to qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs
diff --git a/dotnet/client-010/test/transport/util/SerialTest.cs b/qpid/dotnet/client-010/test/transport/util/SerialTest.cs
similarity index 100%
rename from dotnet/client-010/test/transport/util/SerialTest.cs
rename to qpid/dotnet/client-010/test/transport/util/SerialTest.cs
diff --git a/dotnet/client-010/test/transport/util/UUIDTest.cs b/qpid/dotnet/client-010/test/transport/util/UUIDTest.cs
similarity index 100%
rename from dotnet/client-010/test/transport/util/UUIDTest.cs
rename to qpid/dotnet/client-010/test/transport/util/UUIDTest.cs
diff --git a/dotnet/client-010/wcf/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/wcf/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/wcf/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/ConfigDemo.suo b/qpid/dotnet/client-010/wcf/demo/ConfigDemo.suo
similarity index 100%
rename from dotnet/client-010/wcf/demo/ConfigDemo.suo
rename to qpid/dotnet/client-010/wcf/demo/ConfigDemo.suo
Binary files differ
diff --git a/dotnet/client-010/wcf/demo/Demo.suo b/qpid/dotnet/client-010/wcf/demo/Demo.suo
similarity index 100%
rename from dotnet/client-010/wcf/demo/Demo.suo
rename to qpid/dotnet/client-010/wcf/demo/Demo.suo
Binary files differ
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.Designer.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Form1.resx
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.Designer.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Resources.resx
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.Designer.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/Properties/Settings.settings
diff --git a/dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj b/qpid/dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingClient/wcBookingClient.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Booking.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingServer/IBooking.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Order.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingServer/Receipt.cs
diff --git a/dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj b/qpid/dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj
rename to qpid/dotnet/client-010/wcf/demo/wcfBookingServer/wcfBookingServer.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/App.config b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/App.config
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloClient/App.config
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloClient/App.config
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloClient/HelloClient.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloClient/IHelloService.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloClient/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj b/qpid/dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloClient/wcfHelloClient.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/App.config b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloServer/App.config
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloServer/HelloService.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloServer/IHelloService.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloServer/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj
rename to qpid/dotnet/client-010/wcf/demo/wcfHelloServer/wcfHelloServer.csproj
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfRPC/IUpperCase.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/Program.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/Program.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfRPC/Program.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfRPC/Program.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfRPC/Properties/AssemblyInfo.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfRPC/QpidBindingConfigurationElement.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs b/qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs
rename to qpid/dotnet/client-010/wcf/demo/wcfRPC/UpperCase.cs
diff --git a/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj b/qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj
similarity index 100%
rename from dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj
rename to qpid/dotnet/client-010/wcf/demo/wcfRPC/wcfRPC.csproj
diff --git a/dotnet/client-010/wcf/model/CommunicationOperation.cs b/qpid/dotnet/client-010/wcf/model/CommunicationOperation.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/CommunicationOperation.cs
rename to qpid/dotnet/client-010/wcf/model/CommunicationOperation.cs
diff --git a/dotnet/client-010/wcf/model/QpidBinding.cs b/qpid/dotnet/client-010/wcf/model/QpidBinding.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidBinding.cs
rename to qpid/dotnet/client-010/wcf/model/QpidBinding.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelBase.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelBase.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidChannelBase.cs
rename to qpid/dotnet/client-010/wcf/model/QpidChannelBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelFactory.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelFactory.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidChannelFactory.cs
rename to qpid/dotnet/client-010/wcf/model/QpidChannelFactory.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelListener.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelListener.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidChannelListener.cs
rename to qpid/dotnet/client-010/wcf/model/QpidChannelListener.cs
diff --git a/dotnet/client-010/wcf/model/QpidChannelListenerBase.cs b/qpid/dotnet/client-010/wcf/model/QpidChannelListenerBase.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidChannelListenerBase.cs
rename to qpid/dotnet/client-010/wcf/model/QpidChannelListenerBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidInputChannel.cs b/qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidInputChannel.cs
rename to qpid/dotnet/client-010/wcf/model/QpidInputChannel.cs
diff --git a/dotnet/client-010/wcf/model/QpidInputChannelBase.cs b/qpid/dotnet/client-010/wcf/model/QpidInputChannelBase.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidInputChannelBase.cs
rename to qpid/dotnet/client-010/wcf/model/QpidInputChannelBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidOutputChannel.cs b/qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidOutputChannel.cs
rename to qpid/dotnet/client-010/wcf/model/QpidOutputChannel.cs
diff --git a/dotnet/client-010/wcf/model/QpidOutputChannelBase.cs b/qpid/dotnet/client-010/wcf/model/QpidOutputChannelBase.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidOutputChannelBase.cs
rename to qpid/dotnet/client-010/wcf/model/QpidOutputChannelBase.cs
diff --git a/dotnet/client-010/wcf/model/QpidTransportBindingElement.cs b/qpid/dotnet/client-010/wcf/model/QpidTransportBindingElement.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidTransportBindingElement.cs
rename to qpid/dotnet/client-010/wcf/model/QpidTransportBindingElement.cs
diff --git a/dotnet/client-010/wcf/model/QpidTransportElement.cs b/qpid/dotnet/client-010/wcf/model/QpidTransportElement.cs
similarity index 100%
rename from dotnet/client-010/wcf/model/QpidTransportElement.cs
rename to qpid/dotnet/client-010/wcf/model/QpidTransportElement.cs
diff --git a/dotnet/client-010/wcf/wcf.csproj b/qpid/dotnet/client-010/wcf/wcf.csproj
similarity index 100%
rename from dotnet/client-010/wcf/wcf.csproj
rename to qpid/dotnet/client-010/wcf/wcf.csproj
diff --git a/dotnet/client-010/wcf/wcf.sln b/qpid/dotnet/client-010/wcf/wcf.sln
similarity index 100%
rename from dotnet/client-010/wcf/wcf.sln
rename to qpid/dotnet/client-010/wcf/wcf.sln
diff --git a/dotnet/client-010/wcf/wcf.suo b/qpid/dotnet/client-010/wcf/wcf.suo
similarity index 100%
rename from dotnet/client-010/wcf/wcf.suo
rename to qpid/dotnet/client-010/wcf/wcf.suo
Binary files differ
diff --git a/dotnet/default.build b/qpid/dotnet/default.build
similarity index 100%
rename from dotnet/default.build
rename to qpid/dotnet/default.build
diff --git a/etc/LICENSE b/qpid/etc/LICENSE
similarity index 100%
rename from etc/LICENSE
rename to qpid/etc/LICENSE
diff --git a/etc/NOTICE b/qpid/etc/NOTICE
similarity index 100%
rename from etc/NOTICE
rename to qpid/etc/NOTICE
diff --git a/etc/svn-auto-props b/qpid/etc/svn-auto-props
similarity index 100%
rename from etc/svn-auto-props
rename to qpid/etc/svn-auto-props
diff --git a/extras/qmf/.gitignore b/qpid/extras/qmf/.gitignore
similarity index 100%
rename from extras/qmf/.gitignore
rename to qpid/extras/qmf/.gitignore
diff --git a/extras/qmf/LICENSE.txt b/qpid/extras/qmf/LICENSE.txt
similarity index 100%
rename from extras/qmf/LICENSE.txt
rename to qpid/extras/qmf/LICENSE.txt
diff --git a/extras/qmf/NOTICE.txt b/qpid/extras/qmf/NOTICE.txt
similarity index 100%
rename from extras/qmf/NOTICE.txt
rename to qpid/extras/qmf/NOTICE.txt
diff --git a/extras/qmf/setup.py b/qpid/extras/qmf/setup.py
similarity index 100%
rename from extras/qmf/setup.py
rename to qpid/extras/qmf/setup.py
diff --git a/extras/qmf/src/py/qmf/__init__.py b/qpid/extras/qmf/src/py/qmf/__init__.py
similarity index 100%
rename from extras/qmf/src/py/qmf/__init__.py
rename to qpid/extras/qmf/src/py/qmf/__init__.py
diff --git a/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py
similarity index 100%
rename from extras/qmf/src/py/qmf/console.py
rename to qpid/extras/qmf/src/py/qmf/console.py
diff --git a/extras/qmf/src/py/qmf2-prototype/__init__.py b/qpid/extras/qmf/src/py/qmf2-prototype/__init__.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/__init__.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/__init__.py
diff --git a/extras/qmf/src/py/qmf2-prototype/agent.py b/qpid/extras/qmf/src/py/qmf2-prototype/agent.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/agent.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/agent.py
diff --git a/extras/qmf/src/py/qmf2-prototype/common.py b/qpid/extras/qmf/src/py/qmf2-prototype/common.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/common.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/common.py
diff --git a/extras/qmf/src/py/qmf2-prototype/console.py b/qpid/extras/qmf/src/py/qmf2-prototype/console.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/console.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/console.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/__init__.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/__init__.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/__init__.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/__init__.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/async_method.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_method.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/async_method.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/async_method.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/async_query.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_query.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/async_query.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/async_query.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/console_test.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/console_test.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/console_test.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/console_test.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/events.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/events.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/events.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/events.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
diff --git a/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py
similarity index 100%
rename from extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py
rename to qpid/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py
diff --git a/extras/sasl/LICENSE b/qpid/extras/sasl/LICENSE
similarity index 100%
rename from extras/sasl/LICENSE
rename to qpid/extras/sasl/LICENSE
diff --git a/extras/sasl/Makefile.am b/qpid/extras/sasl/Makefile.am
similarity index 100%
rename from extras/sasl/Makefile.am
rename to qpid/extras/sasl/Makefile.am
diff --git a/extras/sasl/bootstrap b/qpid/extras/sasl/bootstrap
similarity index 100%
rename from extras/sasl/bootstrap
rename to qpid/extras/sasl/bootstrap
diff --git a/extras/sasl/build-aux/compile b/qpid/extras/sasl/build-aux/compile
similarity index 100%
rename from extras/sasl/build-aux/compile
rename to qpid/extras/sasl/build-aux/compile
diff --git a/extras/sasl/build-aux/config.guess b/qpid/extras/sasl/build-aux/config.guess
similarity index 100%
rename from extras/sasl/build-aux/config.guess
rename to qpid/extras/sasl/build-aux/config.guess
diff --git a/extras/sasl/build-aux/config.rpath b/qpid/extras/sasl/build-aux/config.rpath
similarity index 100%
rename from extras/sasl/build-aux/config.rpath
rename to qpid/extras/sasl/build-aux/config.rpath
diff --git a/extras/sasl/build-aux/config.sub b/qpid/extras/sasl/build-aux/config.sub
similarity index 100%
rename from extras/sasl/build-aux/config.sub
rename to qpid/extras/sasl/build-aux/config.sub
diff --git a/extras/sasl/build-aux/depcomp b/qpid/extras/sasl/build-aux/depcomp
similarity index 100%
rename from extras/sasl/build-aux/depcomp
rename to qpid/extras/sasl/build-aux/depcomp
diff --git a/extras/sasl/build-aux/install-sh b/qpid/extras/sasl/build-aux/install-sh
similarity index 100%
rename from extras/sasl/build-aux/install-sh
rename to qpid/extras/sasl/build-aux/install-sh
diff --git a/extras/sasl/build-aux/mdate-sh b/qpid/extras/sasl/build-aux/mdate-sh
similarity index 100%
rename from extras/sasl/build-aux/mdate-sh
rename to qpid/extras/sasl/build-aux/mdate-sh
diff --git a/extras/sasl/build-aux/missing b/qpid/extras/sasl/build-aux/missing
similarity index 100%
rename from extras/sasl/build-aux/missing
rename to qpid/extras/sasl/build-aux/missing
diff --git a/extras/sasl/build-aux/py-compile b/qpid/extras/sasl/build-aux/py-compile
similarity index 100%
rename from extras/sasl/build-aux/py-compile
rename to qpid/extras/sasl/build-aux/py-compile
diff --git a/extras/sasl/configure.ac b/qpid/extras/sasl/configure.ac
similarity index 100%
rename from extras/sasl/configure.ac
rename to qpid/extras/sasl/configure.ac
diff --git a/extras/sasl/include/saslwrapper.h b/qpid/extras/sasl/include/saslwrapper.h
similarity index 100%
rename from extras/sasl/include/saslwrapper.h
rename to qpid/extras/sasl/include/saslwrapper.h
diff --git a/extras/sasl/m4/ac_pkg_swig.m4 b/qpid/extras/sasl/m4/ac_pkg_swig.m4
similarity index 100%
rename from extras/sasl/m4/ac_pkg_swig.m4
rename to qpid/extras/sasl/m4/ac_pkg_swig.m4
diff --git a/extras/sasl/m4/compiler-flags.m4 b/qpid/extras/sasl/m4/compiler-flags.m4
similarity index 100%
rename from extras/sasl/m4/compiler-flags.m4
rename to qpid/extras/sasl/m4/compiler-flags.m4
diff --git a/extras/sasl/python/Makefile.am b/qpid/extras/sasl/python/Makefile.am
similarity index 100%
rename from extras/sasl/python/Makefile.am
rename to qpid/extras/sasl/python/Makefile.am
diff --git a/extras/sasl/python/python.i b/qpid/extras/sasl/python/python.i
similarity index 100%
rename from extras/sasl/python/python.i
rename to qpid/extras/sasl/python/python.i
diff --git a/extras/sasl/ruby/Makefile.am b/qpid/extras/sasl/ruby/Makefile.am
similarity index 100%
rename from extras/sasl/ruby/Makefile.am
rename to qpid/extras/sasl/ruby/Makefile.am
diff --git a/extras/sasl/ruby/ruby.i b/qpid/extras/sasl/ruby/ruby.i
similarity index 100%
rename from extras/sasl/ruby/ruby.i
rename to qpid/extras/sasl/ruby/ruby.i
diff --git a/extras/sasl/src/Makefile.am b/qpid/extras/sasl/src/Makefile.am
similarity index 100%
rename from extras/sasl/src/Makefile.am
rename to qpid/extras/sasl/src/Makefile.am
diff --git a/extras/sasl/src/cyrus/saslwrapper.cpp b/qpid/extras/sasl/src/cyrus/saslwrapper.cpp
similarity index 100%
rename from extras/sasl/src/cyrus/saslwrapper.cpp
rename to qpid/extras/sasl/src/cyrus/saslwrapper.cpp
diff --git a/extras/sasl/src/saslwrapper.i b/qpid/extras/sasl/src/saslwrapper.i
similarity index 100%
rename from extras/sasl/src/saslwrapper.i
rename to qpid/extras/sasl/src/saslwrapper.i
diff --git a/gentools/LICENSE b/qpid/gentools/LICENSE
similarity index 100%
rename from gentools/LICENSE
rename to qpid/gentools/LICENSE
diff --git a/gentools/NOTICE b/qpid/gentools/NOTICE
similarity index 100%
rename from gentools/NOTICE
rename to qpid/gentools/NOTICE
diff --git a/gentools/README.txt b/qpid/gentools/README.txt
similarity index 100%
rename from gentools/README.txt
rename to qpid/gentools/README.txt
diff --git a/gentools/build b/qpid/gentools/build
similarity index 100%
rename from gentools/build
rename to qpid/gentools/build
diff --git a/gentools/build.xml b/qpid/gentools/build.xml
similarity index 100%
rename from gentools/build.xml
rename to qpid/gentools/build.xml
diff --git a/gentools/lib/LICENSE b/qpid/gentools/lib/LICENSE
similarity index 100%
rename from gentools/lib/LICENSE
rename to qpid/gentools/lib/LICENSE
diff --git a/gentools/lib/NOTICE b/qpid/gentools/lib/NOTICE
similarity index 100%
rename from gentools/lib/NOTICE
rename to qpid/gentools/lib/NOTICE
diff --git a/gentools/lib/README.txt b/qpid/gentools/lib/README.txt
similarity index 100%
rename from gentools/lib/README.txt
rename to qpid/gentools/lib/README.txt
diff --git a/gentools/lib/velocity-1.4.jar b/qpid/gentools/lib/velocity-1.4.jar
similarity index 100%
rename from gentools/lib/velocity-1.4.jar
rename to qpid/gentools/lib/velocity-1.4.jar
Binary files differ
diff --git a/gentools/lib/velocity-dep-1.4.jar b/qpid/gentools/lib/velocity-dep-1.4.jar
similarity index 100%
rename from gentools/lib/velocity-dep-1.4.jar
rename to qpid/gentools/lib/velocity-dep-1.4.jar
Binary files differ
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpClass.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpClass.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpConstant.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpConstant.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomain.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpDomain.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpField.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpField.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpMethod.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpModel.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpModel.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpParseException.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpParseException.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpVersion.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpVersion.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
diff --git a/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java b/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
rename to qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
diff --git a/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
rename to qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
rename to qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java b/qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
rename to qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
diff --git a/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/CppGenerator.java
rename to qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
diff --git a/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
rename to qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
diff --git a/gentools/src/org/apache/qpid/gentools/GenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/GenerateMethod.java
rename to qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/Generator.java b/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/Generator.java
rename to qpid/gentools/src/org/apache/qpid/gentools/Generator.java
diff --git a/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/JavaGenerator.java
rename to qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
diff --git a/gentools/src/org/apache/qpid/gentools/LanguageConverter.java b/qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/LanguageConverter.java
rename to qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
diff --git a/gentools/src/org/apache/qpid/gentools/Main.java b/qpid/gentools/src/org/apache/qpid/gentools/Main.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/Main.java
rename to qpid/gentools/src/org/apache/qpid/gentools/Main.java
diff --git a/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
rename to qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/NodeAware.java b/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/NodeAware.java
rename to qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
diff --git a/gentools/src/org/apache/qpid/gentools/Printable.java b/qpid/gentools/src/org/apache/qpid/gentools/Printable.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/Printable.java
rename to qpid/gentools/src/org/apache/qpid/gentools/Printable.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
rename to qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionField.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/SingleVersionField.java
rename to qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
rename to qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
diff --git a/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java b/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
rename to qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
diff --git a/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java b/qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
rename to qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
diff --git a/gentools/src/org/apache/qpid/gentools/Utils.java b/qpid/gentools/src/org/apache/qpid/gentools/Utils.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/Utils.java
rename to qpid/gentools/src/org/apache/qpid/gentools/Utils.java
diff --git a/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java b/qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
similarity index 100%
rename from gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
rename to qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
diff --git a/gentools/templ.cpp/method/MethodBodyClass.h.tmpl b/qpid/gentools/templ.cpp/method/MethodBodyClass.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/method/MethodBodyClass.h.tmpl
rename to qpid/gentools/templ.cpp/method/MethodBodyClass.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_Constants.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_Constants.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_Constants.h.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_Constants.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl b/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
diff --git a/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl b/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
similarity index 100%
rename from gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
rename to qpid/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
diff --git a/gentools/templ.java/PropertyContentHeaderClass.tmpl b/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
similarity index 100%
rename from gentools/templ.java/PropertyContentHeaderClass.tmpl
rename to qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
diff --git a/gentools/templ.java/method/version/MethodBodyClass.vm b/qpid/gentools/templ.java/method/version/MethodBodyClass.vm
similarity index 100%
rename from gentools/templ.java/method/version/MethodBodyClass.vm
rename to qpid/gentools/templ.java/method/version/MethodBodyClass.vm
diff --git a/gentools/templ.java/model/ProtocolVersionListClass.vm b/qpid/gentools/templ.java/model/ProtocolVersionListClass.vm
similarity index 100%
rename from gentools/templ.java/model/ProtocolVersionListClass.vm
rename to qpid/gentools/templ.java/model/ProtocolVersionListClass.vm
diff --git a/gentools/templ.java/model/version/AmqpConstantsClass.vm b/qpid/gentools/templ.java/model/version/AmqpConstantsClass.vm
similarity index 100%
rename from gentools/templ.java/model/version/AmqpConstantsClass.vm
rename to qpid/gentools/templ.java/model/version/AmqpConstantsClass.vm
diff --git a/gentools/templ.java/model/version/MethodRegistryClass.vm b/qpid/gentools/templ.java/model/version/MethodRegistryClass.vm
similarity index 100%
rename from gentools/templ.java/model/version/MethodRegistryClass.vm
rename to qpid/gentools/templ.java/model/version/MethodRegistryClass.vm
diff --git a/gentools/xml-src/amqp-0.10.test.xml b/qpid/gentools/xml-src/amqp-0.10.test.xml
similarity index 100%
rename from gentools/xml-src/amqp-0.10.test.xml
rename to qpid/gentools/xml-src/amqp-0.10.test.xml
diff --git a/gentools/xml-src/amqp-0.8.test.xml b/qpid/gentools/xml-src/amqp-0.8.test.xml
similarity index 100%
rename from gentools/xml-src/amqp-0.8.test.xml
rename to qpid/gentools/xml-src/amqp-0.8.test.xml
diff --git a/gentools/xml-src/amqp-0.9.test.xml b/qpid/gentools/xml-src/amqp-0.9.test.xml
similarity index 100%
rename from gentools/xml-src/amqp-0.9.test.xml
rename to qpid/gentools/xml-src/amqp-0.9.test.xml
diff --git a/gentools/xml-src/cluster-0.9.test.xml b/qpid/gentools/xml-src/cluster-0.9.test.xml
similarity index 100%
rename from gentools/xml-src/cluster-0.9.test.xml
rename to qpid/gentools/xml-src/cluster-0.9.test.xml
diff --git a/java/broker-plugins/access-control/MANIFEST.MF b/qpid/java/broker-plugins/access-control/MANIFEST.MF
similarity index 100%
rename from java/broker-plugins/access-control/MANIFEST.MF
rename to qpid/java/broker-plugins/access-control/MANIFEST.MF
diff --git a/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml
similarity index 100%
rename from java/broker-plugins/access-control/build.xml
rename to qpid/java/broker-plugins/access-control/build.xml
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Action.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/logging/AccessControl_logmessages.properties
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlActivator.java
diff --git a/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
similarity index 100%
rename from java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
rename to qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
diff --git a/java/broker-plugins/access-control/src/main/resources/acl.xsd b/qpid/java/broker-plugins/access-control/src/main/resources/acl.xsd
similarity index 100%
rename from java/broker-plugins/access-control/src/main/resources/acl.xsd
rename to qpid/java/broker-plugins/access-control/src/main/resources/acl.xsd
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java
similarity index 100%
rename from java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java
rename to qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AccessControlTest.java
diff --git a/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
similarity index 100%
rename from java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
rename to qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
diff --git a/java/broker-plugins/experimental/info/MANIFEST.MF b/qpid/java/broker-plugins/experimental/info/MANIFEST.MF
similarity index 100%
rename from java/broker-plugins/experimental/info/MANIFEST.MF
rename to qpid/java/broker-plugins/experimental/info/MANIFEST.MF
diff --git a/java/broker-plugins/experimental/info/build.properties b/qpid/java/broker-plugins/experimental/info/build.properties
similarity index 100%
rename from java/broker-plugins/experimental/info/build.properties
rename to qpid/java/broker-plugins/experimental/info/build.properties
diff --git a/java/broker-plugins/experimental/info/build.xml b/qpid/java/broker-plugins/experimental/info/build.xml
similarity index 100%
rename from java/broker-plugins/experimental/info/build.xml
rename to qpid/java/broker-plugins/experimental/info/build.xml
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Info.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoService.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/SystemInfo.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/HttpPoster.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/IniFileReader.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/SoapClient.java
diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
rename to qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/HttpPosterTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServlet.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/IniFileReaderTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SoapClientTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/SystemInfoTest.java
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java
similarity index 100%
rename from java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java
rename to qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/XMLWriterTest.java
diff --git a/java/broker-plugins/experimental/shutdown/MANIFEST.MF b/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
similarity index 100%
rename from java/broker-plugins/experimental/shutdown/MANIFEST.MF
rename to qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
diff --git a/java/broker-plugins/experimental/shutdown/build.xml b/qpid/java/broker-plugins/experimental/shutdown/build.xml
similarity index 100%
rename from java/broker-plugins/experimental/shutdown/build.xml
rename to qpid/java/broker-plugins/experimental/shutdown/build.xml
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
similarity index 100%
rename from java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
rename to qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
similarity index 100%
rename from java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
rename to qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
similarity index 100%
rename from java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
rename to qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
diff --git a/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd b/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
similarity index 100%
rename from java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
rename to qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
diff --git a/java/broker-plugins/extras/MANIFEST.MF b/qpid/java/broker-plugins/extras/MANIFEST.MF
similarity index 100%
rename from java/broker-plugins/extras/MANIFEST.MF
rename to qpid/java/broker-plugins/extras/MANIFEST.MF
diff --git a/java/broker-plugins/extras/build.xml b/qpid/java/broker-plugins/extras/build.xml
similarity index 100%
rename from java/broker-plugins/extras/build.xml
rename to qpid/java/broker-plugins/extras/build.xml
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
similarity index 100%
rename from java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
rename to qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
similarity index 100%
rename from java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
rename to qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
similarity index 100%
rename from java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
rename to qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
similarity index 100%
rename from java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
rename to qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
diff --git a/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java b/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
similarity index 100%
rename from java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
rename to qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
diff --git a/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java b/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
similarity index 100%
rename from java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
rename to qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
diff --git a/java/broker-plugins/firewall/MANIFEST.MF b/qpid/java/broker-plugins/firewall/MANIFEST.MF
similarity index 100%
rename from java/broker-plugins/firewall/MANIFEST.MF
rename to qpid/java/broker-plugins/firewall/MANIFEST.MF
diff --git a/java/broker-plugins/firewall/build.xml b/qpid/java/broker-plugins/firewall/build.xml
similarity index 100%
rename from java/broker-plugins/firewall/build.xml
rename to qpid/java/broker-plugins/firewall/build.xml
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java
similarity index 100%
rename from java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java
rename to qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallException.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java
similarity index 100%
rename from java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java
rename to qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/config/FirewallRule.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
similarity index 100%
rename from java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
rename to qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
similarity index 100%
rename from java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
rename to qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallActivator.java
diff --git a/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
similarity index 100%
rename from java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
rename to qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
diff --git a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
similarity index 100%
rename from java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
rename to qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
diff --git a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
similarity index 100%
rename from java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
rename to qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
diff --git a/java/broker-plugins/simple-xml/MANIFEST.MF b/qpid/java/broker-plugins/simple-xml/MANIFEST.MF
similarity index 100%
rename from java/broker-plugins/simple-xml/MANIFEST.MF
rename to qpid/java/broker-plugins/simple-xml/MANIFEST.MF
diff --git a/java/broker-plugins/simple-xml/build.xml b/qpid/java/broker-plugins/simple-xml/build.xml
similarity index 100%
rename from java/broker-plugins/simple-xml/build.xml
rename to qpid/java/broker-plugins/simple-xml/build.xml
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java
similarity index 100%
rename from java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java
rename to qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/config/PrincipalPermissions.java
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
similarity index 100%
rename from java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
rename to qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java
similarity index 100%
rename from java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java
rename to qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLActivator.java
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java b/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
similarity index 100%
rename from java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
rename to qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
diff --git a/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java b/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
similarity index 100%
rename from java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
rename to qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
diff --git a/java/broker/bin/create-example-ssl-stores.bat b/qpid/java/broker/bin/create-example-ssl-stores.bat
similarity index 100%
rename from java/broker/bin/create-example-ssl-stores.bat
rename to qpid/java/broker/bin/create-example-ssl-stores.bat
diff --git a/java/broker/bin/create-example-ssl-stores.sh b/qpid/java/broker/bin/create-example-ssl-stores.sh
similarity index 100%
rename from java/broker/bin/create-example-ssl-stores.sh
rename to qpid/java/broker/bin/create-example-ssl-stores.sh
diff --git a/java/broker/bin/msTool.sh b/qpid/java/broker/bin/msTool.sh
similarity index 100%
rename from java/broker/bin/msTool.sh
rename to qpid/java/broker/bin/msTool.sh
diff --git a/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd
similarity index 100%
rename from java/broker/bin/qpid-passwd
rename to qpid/java/broker/bin/qpid-passwd
diff --git a/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
similarity index 100%
rename from java/broker/bin/qpid-server
rename to qpid/java/broker/bin/qpid-server
diff --git a/java/broker/bin/qpid-server.bat b/qpid/java/broker/bin/qpid-server.bat
similarity index 100%
rename from java/broker/bin/qpid-server.bat
rename to qpid/java/broker/bin/qpid-server.bat
diff --git a/java/broker/bin/qpid.stop b/qpid/java/broker/bin/qpid.stop
similarity index 100%
rename from java/broker/bin/qpid.stop
rename to qpid/java/broker/bin/qpid.stop
diff --git a/java/broker/bin/qpid.stopall b/qpid/java/broker/bin/qpid.stopall
similarity index 100%
rename from java/broker/bin/qpid.stopall
rename to qpid/java/broker/bin/qpid.stopall
diff --git a/java/broker/build.xml b/qpid/java/broker/build.xml
similarity index 100%
rename from java/broker/build.xml
rename to qpid/java/broker/build.xml
diff --git a/java/broker/etc/access b/qpid/java/broker/etc/access
similarity index 100%
rename from java/broker/etc/access
rename to qpid/java/broker/etc/access
diff --git a/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml
similarity index 100%
rename from java/broker/etc/config.xml
rename to qpid/java/broker/etc/config.xml
diff --git a/java/broker/etc/debug.log4j.xml b/qpid/java/broker/etc/debug.log4j.xml
similarity index 100%
rename from java/broker/etc/debug.log4j.xml
rename to qpid/java/broker/etc/debug.log4j.xml
diff --git a/java/broker/etc/log4j.xml b/qpid/java/broker/etc/log4j.xml
similarity index 100%
rename from java/broker/etc/log4j.xml
rename to qpid/java/broker/etc/log4j.xml
diff --git a/java/broker/etc/md5passwd b/qpid/java/broker/etc/md5passwd
similarity index 100%
rename from java/broker/etc/md5passwd
rename to qpid/java/broker/etc/md5passwd
diff --git a/java/broker/etc/mstool-log4j.xml b/qpid/java/broker/etc/mstool-log4j.xml
similarity index 100%
rename from java/broker/etc/mstool-log4j.xml
rename to qpid/java/broker/etc/mstool-log4j.xml
diff --git a/java/broker/etc/passwd b/qpid/java/broker/etc/passwd
similarity index 100%
rename from java/broker/etc/passwd
rename to qpid/java/broker/etc/passwd
diff --git a/java/broker/etc/passwdVhost b/qpid/java/broker/etc/passwdVhost
similarity index 100%
rename from java/broker/etc/passwdVhost
rename to qpid/java/broker/etc/passwdVhost
diff --git a/java/broker/etc/qpid-server.conf b/qpid/java/broker/etc/qpid-server.conf
similarity index 100%
rename from java/broker/etc/qpid-server.conf
rename to qpid/java/broker/etc/qpid-server.conf
diff --git a/java/broker/etc/qpid-server.conf.jpp b/qpid/java/broker/etc/qpid-server.conf.jpp
similarity index 100%
rename from java/broker/etc/qpid-server.conf.jpp
rename to qpid/java/broker/etc/qpid-server.conf.jpp
diff --git a/java/broker/etc/qpid.passwd b/qpid/java/broker/etc/qpid.passwd
similarity index 100%
rename from java/broker/etc/qpid.passwd
rename to qpid/java/broker/etc/qpid.passwd
diff --git a/java/broker/etc/virtualhosts.xml b/qpid/java/broker/etc/virtualhosts.xml
similarity index 100%
rename from java/broker/etc/virtualhosts.xml
rename to qpid/java/broker/etc/virtualhosts.xml
diff --git a/java/broker/python-test.xml b/qpid/java/broker/python-test.xml
similarity index 100%
rename from java/broker/python-test.xml
rename to qpid/java/broker/python-test.xml
diff --git a/java/broker/scripts/resetAlerting.sh b/qpid/java/broker/scripts/resetAlerting.sh
similarity index 100%
rename from java/broker/scripts/resetAlerting.sh
rename to qpid/java/broker/scripts/resetAlerting.sh
diff --git a/java/broker/src/main/grammar/SelectorParser.jj b/qpid/java/broker/src/main/grammar/SelectorParser.jj
similarity index 100%
rename from java/broker/src/main/grammar/SelectorParser.jj
rename to qpid/java/broker/src/main/grammar/SelectorParser.jj
diff --git a/java/broker/src/main/java/log4j.properties b/qpid/java/broker/src/main/java/log4j.properties
similarity index 100%
rename from java/broker/src/main/java/log4j.properties
rename to qpid/java/broker/src/main/java/log4j.properties
diff --git a/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java b/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
rename to qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
diff --git a/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java b/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
rename to qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java b/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/CompletionCode.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerRequestCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFBrokerResponseCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClass.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassIndicationCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFClassQueryCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandCompletionCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandDecoder.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFCommandHeader.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventClass.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFEventSeverity.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFGetQueryCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethod.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodInvocation.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodRequestCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFMethodResponseCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFObjectClass.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFOperation.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageIndicationCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFPackageQueryCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFProperty.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaRequestCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFSchemaResponseCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFStatistic.java
diff --git a/java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java b/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/Main.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMap.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessageMapImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BindingConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BridgeConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigObjectType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigProperty.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfigurationManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConfiguredObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ConnectionConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ExchangeConfigurationPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/LinkConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SessionConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfig.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfigType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagementMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionPolicyConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/connection/IConnectionRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInUseException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKey.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderKeyDictionary.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeaderMatcherResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersMatcherDFAState.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicNormalizer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicWordDictionary.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/AccessRequestHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicAckMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicCancelMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicPublishMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicQosHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverSyncMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelCloseOkHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelFlowHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ChannelOpenHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionCloseOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionOpenMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionTuneOkMethodHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeBoundHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeleteHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/OnCurrentThreadExecutor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueBindHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeleteHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueuePurgeHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_9.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_0_91.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ServerMethodDispatcherImpl_8_0.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxCommitHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxSelectHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/handler/UnexpectedMethodException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ServerInformationMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/AbstractRootMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/CompositeStartupMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/LogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/NullRootMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/SystemOutMessageLogger.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/BrokerActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/CurrentActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ConfigStore_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/MessageStore_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/LogSubjectFormat.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessageReference.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/ContentHeaderBodyAdapter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/InboundMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageContentSource.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageReference.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/ServerMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/message/TransferMessageReference.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/output/HeaderPropertiesConverter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/output/ProtocolOutputConverterRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Activator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQConnectionModel.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQNoMethodHandlerException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/BaseQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/FailedDequeueException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/Filterable.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/MessageCleanupException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryListFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/registry/BrokerConfigAdapter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/PrincipalHolder.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/Result.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/Result.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/Result.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/Result.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginActivator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Permission.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/ConfigurationFilePrincipalDatabaseManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainUser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PrincipalDatabaseManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabaseManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticator.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/JCAProvider.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipal.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/amqplain/AmqPlainSaslServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQState.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/state/IllegalStateTransitionException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateAwareMethodListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/state/StateListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/DurableConfigurationStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageMetaDataType.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreClosedException.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/MessageStoreRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoreContext.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/StoredMessage.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLog.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogResource.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ClientDeliveryMethod.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/MessageAcceptCompletionListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/RecordDeliveryMethod.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionFactoryImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/ConfiguredQueueBindingListener.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostHouseKeepingPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/VirtualHostPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/SlowConsumerDetection_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/logging/TopicDeletePolicy_logmessages.properties
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
diff --git a/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfiguration.java
diff --git a/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPlugin.java
diff --git a/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/slowconsumerdetection/policies/SlowConsumerPolicyPluginFactory.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
diff --git a/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
similarity index 100%
rename from java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
rename to qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
diff --git a/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java b/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
rename to qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/RunBrokerWithCommand.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/TopicConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseConnectionActorTestCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/TestLogActor.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/AbstractTestMessages.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MaxChannelsTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueThreadPoolTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/store/ReferenceCountingTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionPolicyConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetectionQueueConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyConfigurationTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
diff --git a/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java b/qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
similarity index 100%
rename from java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
rename to qpid/java/broker/src/test/java/org/apache/qpid/util/MockChannel.java
diff --git a/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java b/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
similarity index 100%
rename from java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
rename to qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
diff --git a/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
similarity index 100%
rename from java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
rename to qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
diff --git a/java/broker/src/xsl/qmf.xsl b/qpid/java/broker/src/xsl/qmf.xsl
similarity index 100%
rename from java/broker/src/xsl/qmf.xsl
rename to qpid/java/broker/src/xsl/qmf.xsl
diff --git a/java/build.deps b/qpid/java/build.deps
similarity index 100%
rename from java/build.deps
rename to qpid/java/build.deps
diff --git a/java/build.xml b/qpid/java/build.xml
similarity index 100%
rename from java/build.xml
rename to qpid/java/build.xml
diff --git a/java/client/README.txt b/qpid/java/client/README.txt
similarity index 100%
rename from java/client/README.txt
rename to qpid/java/client/README.txt
diff --git a/java/client/build.xml b/qpid/java/client/build.xml
similarity index 100%
rename from java/client/build.xml
rename to qpid/java/client/build.xml
diff --git a/java/client/example/build.xml b/qpid/java/client/example/build.xml
similarity index 100%
rename from java/client/example/build.xml
rename to qpid/java/client/example/build.xml
diff --git a/java/client/example/src/main/java/README.txt b/qpid/java/client/example/src/main/java/README.txt
similarity index 100%
rename from java/client/example/src/main/java/README.txt
rename to qpid/java/client/example/src/main/java/README.txt
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Drain.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/Drain.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/Drain.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Hello.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/Hello.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/Hello.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/MapSender.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/Spout.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/Spout.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/Spout.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/hello.properties b/qpid/java/client/example/src/main/java/org/apache/qpid/example/hello.properties
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/hello.properties
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/hello.properties
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageDispatcher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/FileMessageFactory.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MessageFactoryException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/MultiMessageDispatcher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/publisher/UndeliveredMessageException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/ConnectionSetup.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ConnectionException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/ContextException.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/FileUtils.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/InitialContextHelper.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/Statics.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties b/qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/shared/example.properties
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriber.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/MonitoredSubscriptionWrapper.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/Subscriber.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/subscriber/SubscriptionWrapper.java
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java b/qpid/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java
similarity index 100%
rename from java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java
rename to qpid/java/client/example/src/main/java/org/apache/qpid/example/transport/ExistingSocketConnectorDemo.java
diff --git a/java/client/example/src/main/java/runSample.sh b/qpid/java/client/example/src/main/java/runSample.sh
similarity index 100%
rename from java/client/example/src/main/java/runSample.sh
rename to qpid/java/client/example/src/main/java/runSample.sh
diff --git a/java/client/src/main/grammar/SelectorParser.jj b/qpid/java/client/src/main/grammar/SelectorParser.jj
similarity index 100%
rename from java/client/src/main/grammar/SelectorParser.jj
rename to qpid/java/client/src/main/grammar/SelectorParser.jj
diff --git a/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd
similarity index 100%
rename from java/client/src/main/java/client.bnd
rename to qpid/java/client/src/main/java/client.bnd
diff --git a/java/client/src/main/java/client.log4j b/qpid/java/client/src/main/java/client.log4j
similarity index 100%
rename from java/client/src/main/java/client.log4j
rename to qpid/java/client/src/main/java/client.log4j
diff --git a/java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java b/qpid/java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
similarity index 100%
rename from java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
rename to qpid/java/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
similarity index 97%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index ab59fee..94a55ef 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -111,7 +111,7 @@
     /** Maps from session id (Integer) to AMQSession instance */
     private final ChannelToSessionMap _sessions = new ChannelToSessionMap();
 
-    private String _clientName;
+    private final String _clientName;
 
     /** The user name to use for authentication */
     private String _username;
@@ -126,7 +126,7 @@
 
     private ConnectionListener _connectionListener;
 
-    private ConnectionURL _connectionURL;
+    private final ConnectionURL _connectionURL;
 
     /**
      * Whether this connection is started, i.e. whether messages are flowing to consumers. It has no meaning for message
@@ -257,6 +257,11 @@
      */
     public AMQConnection(ConnectionURL connectionURL, SSLConfiguration sslConfig) throws AMQException
     {
+        if (connectionURL == null)
+        {
+            throw new IllegalArgumentException("Connection must be specified");
+        }
+        
         // set this connection maxPrefetch
         if (connectionURL.getOption(ConnectionURL.OPTIONS_MAXPREFETCH) != null)
         {
@@ -264,7 +269,7 @@
         }
         else
         {
-            // use the defaul value set for all connections
+            // use the default value set for all connections
             _maxPrefetch = Integer.parseInt(System.getProperties().getProperty(ClientProperties.MAX_PREFETCH_PROP_NAME,
                     ClientProperties.MAX_PREFETCH_DEFAULT));
         }
@@ -278,7 +283,7 @@
         }
         else
         {
-            // use the defaul value set for all connections
+            // use the default value set for all connections
             _syncPersistence = Boolean.getBoolean(ClientProperties.SYNC_PERSISTENT_PROP_NAME);
             if (_syncPersistence)
             {
@@ -293,7 +298,7 @@
         }
         else
         {
-            // use the defaul value set for all connections
+            // use the default value set for all connections
             _syncAck = Boolean.getBoolean(ClientProperties.SYNC_ACK_PROP_NAME);
         }
 
@@ -346,11 +351,6 @@
         }
 
         _sslConfiguration = sslConfig;
-        if (connectionURL == null)
-        {
-            throw new IllegalArgumentException("Connection must be specified");
-        }
-
         _connectionURL = connectionURL;
 
         _clientName = connectionURL.getClientName();
@@ -535,14 +535,6 @@
         }
     }
 
-    protected AMQConnection(String username, String password, String clientName, String virtualHost)
-    {
-        _clientName = clientName;
-        _username = username;
-        _password = password;
-        setVirtualHost(virtualHost);
-    }
-
     private void setVirtualHost(String virtualHost)
     {
         if (virtualHost != null && virtualHost.startsWith("/"))
@@ -696,20 +688,6 @@
         }
     }
 
-    private void reopenChannel(int channelId, int prefetchHigh, int prefetchLow, boolean transacted)
-            throws AMQException, FailoverException
-    {
-        try
-        {
-            createChannelOverWire(channelId, prefetchHigh, prefetchLow, transacted);
-        }
-        catch (AMQException e)
-        {
-            deregisterSession(channelId);
-            throw new AMQException(null, "Error reopening channel " + channelId + " after failover: " + e, e);
-        }
-    }
-
     public void setFailoverPolicy(FailoverPolicy policy)
     {
         _failoverPolicy = policy;
@@ -1372,6 +1350,20 @@
         return buf.toString();
     }
 
+    /**
+     * Returns connection url. 
+     * @return connection url
+     */
+    public ConnectionURL getConnectionURL()
+    {
+        return _connectionURL;
+    }
+    
+    /**
+     * Returns stringified connection url.   This url is suitable only for display
+     * as {@link AMQConnectionURL#toString()} converts any password to asterisks. 
+     * @return connection url
+     */
     public String toURL()
     {
         return _connectionURL.toString();
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_9_1.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueue.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQSession.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java b/qpid/java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/Closeable.java b/qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/Closeable.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/Closeable.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java b/qpid/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java b/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java b/qpid/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/DispatcherCallback.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/JMSAMQException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java b/qpid/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java b/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java b/qpid/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/SSLConfiguration.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
similarity index 98%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
index c81ad64..2b49bb8 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
@@ -226,7 +226,7 @@
         {
             Object instance = mechanismClass.newInstance();
             AMQCallbackHandler cbh = (AMQCallbackHandler) instance;
-            cbh.initialise(protocolSession);
+            cbh.initialise(protocolSession.getAMQConnection().getConnectionURL());
 
             return cbh;
         }
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
similarity index 98%
rename from java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
index 7976760..5b7d272 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
@@ -148,16 +148,6 @@
         return getAMQConnection().getVirtualHost();
     }
 
-    public String getUsername()
-    {
-        return getAMQConnection().getUsername();
-    }
-
-    public String getPassword()
-    {
-        return getAMQConnection().getPassword();
-    }
-
     public SaslClient getSaslClient()
     {
         return _saslClient;
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatConfig.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/protocol/HeartbeatDiagnostics.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/protocol/ProtocolBufferMonitorFilter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
similarity index 88%
rename from java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
index fbca444..67dd1a5 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
@@ -22,9 +22,9 @@
 
 import javax.security.auth.callback.CallbackHandler;
 
-import org.apache.qpid.client.protocol.AMQProtocolSession;
+import org.apache.qpid.jms.ConnectionURL;
 
 public interface AMQCallbackHandler extends CallbackHandler
 {
-    void initialise(AMQProtocolSession protocolSession);    
+    void initialise(ConnectionURL connectionURL);    
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties b/qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
similarity index 84%
rename from java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
index 66176da..6ec83f0 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
@@ -20,30 +20,29 @@
  */
 package org.apache.qpid.client.security;
 
-import org.apache.qpid.client.protocol.AMQProtocolSession;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import org.apache.qpid.jms.ConnectionURL;
 
 public class UsernameHashedPasswordCallbackHandler implements AMQCallbackHandler
 {
-    private static final Logger _logger = LoggerFactory.getLogger(UsernameHashedPasswordCallbackHandler.class);
+    private ConnectionURL _connectionURL;
 
-    private AMQProtocolSession _protocolSession;
-
-    public void initialise(AMQProtocolSession protocolSession)
+    /**
+     * @see org.apache.qpid.client.security.AMQCallbackHandler#initialise(org.apache.qpid.jms.ConnectionURL)
+     */
+    @Override
+    public void initialise(ConnectionURL connectionURL)
     {
-        _protocolSession = protocolSession;
+        _connectionURL = connectionURL;
     }
 
     public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
@@ -53,13 +52,13 @@
             Callback cb = callbacks[i];
             if (cb instanceof NameCallback)
             {
-                ((NameCallback) cb).setName(_protocolSession.getUsername());
+                ((NameCallback) cb).setName(_connectionURL.getUsername());
             }
             else if (cb instanceof PasswordCallback)
             {
                 try
                 {
-                    ((PasswordCallback) cb).setPassword(getHash(_protocolSession.getPassword()));
+                    ((PasswordCallback) cb).setPassword(getHash(_connectionURL.getPassword()));
                 }
                 catch (NoSuchAlgorithmException e)
                 {
@@ -99,4 +98,5 @@
 
         return hash;
     }
+
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
similarity index 77%
rename from java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
index c50c627..ad08872 100644
--- a/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
@@ -27,15 +27,19 @@
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.apache.qpid.client.protocol.AMQProtocolSession;
+import org.apache.qpid.jms.ConnectionURL;
 
 public class UsernamePasswordCallbackHandler implements AMQCallbackHandler
 {
-    private AMQProtocolSession _protocolSession;
+    private ConnectionURL _connectionURL;
 
-    public void initialise(AMQProtocolSession protocolSession)
+    /**
+     * @see org.apache.qpid.client.security.AMQCallbackHandler#initialise(org.apache.qpid.jms.ConnectionURL)
+     */
+    @Override
+    public void initialise(final ConnectionURL connectionURL)
     {
-        _protocolSession = protocolSession;
+        _connectionURL = connectionURL;
     }
 
     public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
@@ -45,11 +49,11 @@
             Callback cb = callbacks[i];
             if (cb instanceof NameCallback)
             {
-                ((NameCallback)cb).setName(_protocolSession.getUsername());
+                ((NameCallback)cb).setName(_connectionURL.getUsername());
             }
             else if (cb instanceof PasswordCallback)
             {
-                ((PasswordCallback)cb).setPassword(_protocolSession.getPassword().toCharArray());
+                ((PasswordCallback)cb).setPassword(_connectionURL.getPassword().toCharArray());
             }
             else
             {
@@ -57,4 +61,5 @@
             }
         }
     }
+
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQState.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java b/qpid/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQNoTransportForProtocolException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/transport/AMQTransportConnectionException.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/transport/ITransportConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/transport/SocketTransportConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/transport/VmPipeTransportConnection.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
diff --git a/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java b/qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/collections/KeyValue.java
rename to qpid/java/client/src/main/java/org/apache/qpid/collections/KeyValue.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
rename to qpid/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java
rename to qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractKeyValue.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java
rename to qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/AbstractMapEntry.java
diff --git a/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java b/qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java
rename to qpid/java/client/src/main/java/org/apache/qpid/collections/keyvalue/DefaultMapEntry.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/BinaryExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/Expression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/Expression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/Expression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java b/qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
rename to qpid/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/Connection.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/Connection.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/Connection.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/Connection.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/Message.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/Message.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/Message.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/Message.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/MessageProducer.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/Session.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/Session.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/Session.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/Session.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/Example.properties b/qpid/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jndi/Example.properties
rename to qpid/java/client/src/main/java/org/apache/qpid/jndi/Example.properties
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java b/qpid/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
diff --git a/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java b/qpid/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
rename to qpid/java/client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
diff --git a/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java b/qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
rename to qpid/java/client/src/main/java/org/apache/qpid/naming/ReadOnlyContext.java
diff --git a/java/client/src/main/java/org/apache/qpid/naming/jndi.properties b/qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/naming/jndi.properties
rename to qpid/java/client/src/main/java/org/apache/qpid/naming/jndi.properties
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
rename to qpid/java/client/src/main/java/org/apache/qpid/nclient/MessagePartListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
rename to qpid/java/client/src/main/java/org/apache/qpid/nclient/util/ByteBufferMessage.java
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
rename to qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessageListener.java
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
similarity index 100%
rename from java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
rename to qpid/java/client/src/main/java/org/apache/qpid/nclient/util/MessagePartListenerAdapter.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindConnectionFactory.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindQueue.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/JNDIBindTopic.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt b/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
rename to qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/README.txt
diff --git a/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java b/qpid/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/cluster/Client.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/codec/BasicDeliverTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/codec/Client.java b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/codec/Client.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/codec/Client.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/codec/Server.java b/qpid/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/codec/Server.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/codec/Server.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/Connector.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/config/Connector.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/config/Connector.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/qpid/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/flow/ChannelFlowTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargePublisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java b/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/TestLargeSubscriber.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/headers/Listener.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/headers/MessageFactory.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/headers/Publisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Bind.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Lookup.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java b/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/jndi/referenceable/Unbind.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/latency/LatencyTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/mina/AcceptorTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/mina/BlockingAcceptorTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/mina/WriterTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/multiconsumer/AMQTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestPublisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java b/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/TestSubscriber.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/PropertiesFileInitialContextFactoryTest.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties b/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
rename to qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/example.properties
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/Config.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/topic/Config.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/topic/Config.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/topic/Listener.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java b/qpid/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/topic/Publisher.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Config.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Ping.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Pong.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Relay.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java b/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/transacted/Start.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java b/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceProvider.java
diff --git a/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java b/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
similarity index 100%
rename from java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
rename to qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/ServiceRequestingClient.java
diff --git a/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java b/qpid/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
similarity index 100%
rename from java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
rename to qpid/java/client/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
similarity index 94%
rename from java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
rename to qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
index da44822..5972bf3 100644
--- a/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
@@ -79,11 +79,6 @@
         super(connectionURL, sslConfig);
     }
 
-    protected MockAMQConnection(String username, String password, String clientName, String virtualHost)
-    {
-        super(username, password, clientName, virtualHost);
-    }
-
     @Override
     public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException
     {
diff --git a/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java b/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
rename to qpid/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/client/protocol/MockIoSession.java b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/MockIoSession.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/client/protocol/MockIoSession.java
rename to qpid/java/client/src/test/java/org/apache/qpid/client/protocol/MockIoSession.java
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
new file mode 100644
index 0000000..98fc09c
--- /dev/null
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
@@ -0,0 +1,99 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.client.security;
+
+import java.security.MessageDigest;
+import java.util.Arrays;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.client.MockAMQConnection;
+import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.protocol.AMQProtocolSession;
+
+/**
+ * Unit tests for the UsernameHashPasswordCallbackHandler.  This callback handler is
+ * used by the CRAM-MD5-HASHED SASL mechanism.
+ *
+ */
+public class UsernameHashedPasswordCallbackHandlerTest extends TestCase
+{
+    private AMQCallbackHandler _callbackHandler = new UsernameHashedPasswordCallbackHandler(); // Class under test
+    private static final String PROMPT_UNUSED = "unused";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        final String url = "amqp://username:password@client/test?brokerlist='vm://:1'";
+        _callbackHandler.initialise(new AMQConnectionURL(url));
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the username from the connection url.
+     */
+    public void testNameCallback() throws Exception
+    {
+        final String expectedName = "username";
+        NameCallback nameCallback = new NameCallback(PROMPT_UNUSED);
+
+        assertNull("Unexpected name before test", nameCallback.getName());
+        _callbackHandler.handle(new Callback[] {nameCallback});
+        assertEquals("Unexpected name", expectedName, nameCallback.getName());
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the password from the connection url
+     *  and calculate a MD5.
+     */
+    public void testDigestedPasswordCallback() throws Exception
+    {
+        final char[] expectedPasswordDigested = getHashPassword("password");
+        
+        PasswordCallback passwordCallback = new PasswordCallback(PROMPT_UNUSED, false);
+        assertNull("Unexpected password before test", passwordCallback.getPassword());
+        _callbackHandler.handle(new Callback[] {passwordCallback});
+        assertTrue("Unexpected password", Arrays.equals(expectedPasswordDigested, passwordCallback.getPassword()));
+    }
+
+    private char[] getHashPassword(final String password) throws Exception
+    {
+        MessageDigest md5Digester = MessageDigest.getInstance("MD5");
+        final byte[] digest = md5Digester.digest(password.getBytes("UTF-8"));
+
+        char[] hash = new char[digest.length];
+
+        int index = 0;
+        for (byte b : digest)
+        {
+            hash[index++] = (char) b;
+        }
+
+        return hash;
+    }
+}
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
new file mode 100644
index 0000000..05a60fb
--- /dev/null
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
@@ -0,0 +1,78 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.client.security;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+
+import junit.framework.TestCase;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.client.MockAMQConnection;
+import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.protocol.AMQProtocolSession;
+
+/**
+ * Unit tests for the UsernamePasswordCallbackHandler.
+ *
+ */
+public class UsernamePasswordCallbackHandlerTest extends TestCase
+{
+    private AMQCallbackHandler _callbackHandler = new UsernamePasswordCallbackHandler(); // Class under test
+    private static final String PROMPT_UNUSED = "unused";
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        final String url = "amqp://username:password@client/test?brokerlist='vm://:1'";
+
+        _callbackHandler.initialise(new AMQConnectionURL(url));
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the username from the connection url.
+     */
+    public void testNameCallback() throws Exception
+    {
+        final String expectedName = "username";
+        NameCallback nameCallback = new NameCallback(PROMPT_UNUSED);
+
+        assertNull("Unexpected name before test", nameCallback.getName());
+        _callbackHandler.handle(new Callback[] {nameCallback});
+        assertEquals("Unexpected name", expectedName, nameCallback.getName());
+    }
+
+    /**
+     *  Tests that the callback handler can correctly retrieve the password from the connection url.
+     */
+    public void testPasswordCallback() throws Exception
+    {
+        final String expectedPassword = "password";
+        PasswordCallback passwordCallback = new PasswordCallback(PROMPT_UNUSED, false);
+        assertNull("Unexpected password before test", passwordCallback.getPassword());
+        _callbackHandler.handle(new Callback[] {passwordCallback});
+        assertEquals("Unexpected password", expectedPassword, new String(passwordCallback.getPassword()));
+    }    
+}
diff --git a/java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java b/qpid/java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDITest.properties
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
similarity index 100%
rename from java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
rename to qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
diff --git a/java/client/test/bin/IBM-JNDI-Setup.bat b/qpid/java/client/test/bin/IBM-JNDI-Setup.bat
similarity index 100%
rename from java/client/test/bin/IBM-JNDI-Setup.bat
rename to qpid/java/client/test/bin/IBM-JNDI-Setup.bat
diff --git a/java/client/test/bin/IBM-JNDI-Setup.sh b/qpid/java/client/test/bin/IBM-JNDI-Setup.sh
similarity index 100%
rename from java/client/test/bin/IBM-JNDI-Setup.sh
rename to qpid/java/client/test/bin/IBM-JNDI-Setup.sh
diff --git a/java/client/test/bin/IBM-Publisher.bat b/qpid/java/client/test/bin/IBM-Publisher.bat
similarity index 100%
rename from java/client/test/bin/IBM-Publisher.bat
rename to qpid/java/client/test/bin/IBM-Publisher.bat
diff --git a/java/client/test/bin/IBM-Publisher.sh b/qpid/java/client/test/bin/IBM-Publisher.sh
similarity index 100%
rename from java/client/test/bin/IBM-Publisher.sh
rename to qpid/java/client/test/bin/IBM-Publisher.sh
diff --git a/java/client/test/bin/IBM-PutGet.bat b/qpid/java/client/test/bin/IBM-PutGet.bat
similarity index 100%
rename from java/client/test/bin/IBM-PutGet.bat
rename to qpid/java/client/test/bin/IBM-PutGet.bat
diff --git a/java/client/test/bin/IBM-PutGet.sh b/qpid/java/client/test/bin/IBM-PutGet.sh
similarity index 100%
rename from java/client/test/bin/IBM-PutGet.sh
rename to qpid/java/client/test/bin/IBM-PutGet.sh
diff --git a/java/client/test/bin/IBM-README.txt b/qpid/java/client/test/bin/IBM-README.txt
similarity index 100%
rename from java/client/test/bin/IBM-README.txt
rename to qpid/java/client/test/bin/IBM-README.txt
diff --git a/java/client/test/bin/IBM-Receiver.bat b/qpid/java/client/test/bin/IBM-Receiver.bat
similarity index 100%
rename from java/client/test/bin/IBM-Receiver.bat
rename to qpid/java/client/test/bin/IBM-Receiver.bat
diff --git a/java/client/test/bin/IBM-Receiver.sh b/qpid/java/client/test/bin/IBM-Receiver.sh
similarity index 100%
rename from java/client/test/bin/IBM-Receiver.sh
rename to qpid/java/client/test/bin/IBM-Receiver.sh
diff --git a/java/client/test/bin/IBM-Sender.bat b/qpid/java/client/test/bin/IBM-Sender.bat
similarity index 100%
rename from java/client/test/bin/IBM-Sender.bat
rename to qpid/java/client/test/bin/IBM-Sender.bat
diff --git a/java/client/test/bin/IBM-Sender.sh b/qpid/java/client/test/bin/IBM-Sender.sh
similarity index 100%
rename from java/client/test/bin/IBM-Sender.sh
rename to qpid/java/client/test/bin/IBM-Sender.sh
diff --git a/java/client/test/bin/IBM-Subscriber.bat b/qpid/java/client/test/bin/IBM-Subscriber.bat
similarity index 100%
rename from java/client/test/bin/IBM-Subscriber.bat
rename to qpid/java/client/test/bin/IBM-Subscriber.bat
diff --git a/java/client/test/bin/IBM-Subscriber.sh b/qpid/java/client/test/bin/IBM-Subscriber.sh
similarity index 100%
rename from java/client/test/bin/IBM-Subscriber.sh
rename to qpid/java/client/test/bin/IBM-Subscriber.sh
diff --git a/java/client/test/bin/headersListener.sh b/qpid/java/client/test/bin/headersListener.sh
similarity index 100%
rename from java/client/test/bin/headersListener.sh
rename to qpid/java/client/test/bin/headersListener.sh
diff --git a/java/client/test/bin/headersListenerGroup.sh b/qpid/java/client/test/bin/headersListenerGroup.sh
similarity index 100%
rename from java/client/test/bin/headersListenerGroup.sh
rename to qpid/java/client/test/bin/headersListenerGroup.sh
diff --git a/java/client/test/bin/headersPublisher.sh b/qpid/java/client/test/bin/headersPublisher.sh
similarity index 100%
rename from java/client/test/bin/headersPublisher.sh
rename to qpid/java/client/test/bin/headersPublisher.sh
diff --git a/java/client/test/bin/run_many.sh b/qpid/java/client/test/bin/run_many.sh
similarity index 100%
rename from java/client/test/bin/run_many.sh
rename to qpid/java/client/test/bin/run_many.sh
diff --git a/java/client/test/bin/serviceProvidingClient.sh b/qpid/java/client/test/bin/serviceProvidingClient.sh
similarity index 100%
rename from java/client/test/bin/serviceProvidingClient.sh
rename to qpid/java/client/test/bin/serviceProvidingClient.sh
diff --git a/java/client/test/bin/serviceRequestingClient.sh b/qpid/java/client/test/bin/serviceRequestingClient.sh
similarity index 100%
rename from java/client/test/bin/serviceRequestingClient.sh
rename to qpid/java/client/test/bin/serviceRequestingClient.sh
diff --git a/java/client/test/bin/testService.sh b/qpid/java/client/test/bin/testService.sh
similarity index 100%
rename from java/client/test/bin/testService.sh
rename to qpid/java/client/test/bin/testService.sh
diff --git a/java/client/test/bin/topicListener.sh b/qpid/java/client/test/bin/topicListener.sh
similarity index 100%
rename from java/client/test/bin/topicListener.sh
rename to qpid/java/client/test/bin/topicListener.sh
diff --git a/java/client/test/bin/topicPublisher.sh b/qpid/java/client/test/bin/topicPublisher.sh
similarity index 100%
rename from java/client/test/bin/topicPublisher.sh
rename to qpid/java/client/test/bin/topicPublisher.sh
diff --git a/java/client/test/etc/ApacheDS.properties b/qpid/java/client/test/etc/ApacheDS.properties
similarity index 100%
rename from java/client/test/etc/ApacheDS.properties
rename to qpid/java/client/test/etc/ApacheDS.properties
diff --git a/java/client/test/example_build.xml b/qpid/java/client/test/example_build.xml
similarity index 100%
rename from java/client/test/example_build.xml
rename to qpid/java/client/test/example_build.xml
diff --git a/java/common.xml b/qpid/java/common.xml
similarity index 100%
rename from java/common.xml
rename to qpid/java/common.xml
diff --git a/java/common/Composite.tpl b/qpid/java/common/Composite.tpl
similarity index 100%
rename from java/common/Composite.tpl
rename to qpid/java/common/Composite.tpl
diff --git a/java/common/Constant.tpl b/qpid/java/common/Constant.tpl
similarity index 100%
rename from java/common/Constant.tpl
rename to qpid/java/common/Constant.tpl
diff --git a/java/common/Enum.tpl b/qpid/java/common/Enum.tpl
similarity index 100%
rename from java/common/Enum.tpl
rename to qpid/java/common/Enum.tpl
diff --git a/java/common/Invoker.tpl b/qpid/java/common/Invoker.tpl
similarity index 100%
rename from java/common/Invoker.tpl
rename to qpid/java/common/Invoker.tpl
diff --git a/java/common/MethodDelegate.tpl b/qpid/java/common/MethodDelegate.tpl
similarity index 100%
rename from java/common/MethodDelegate.tpl
rename to qpid/java/common/MethodDelegate.tpl
diff --git a/java/common/Option.tpl b/qpid/java/common/Option.tpl
similarity index 100%
rename from java/common/Option.tpl
rename to qpid/java/common/Option.tpl
diff --git a/java/common/StructFactory.tpl b/qpid/java/common/StructFactory.tpl
similarity index 100%
rename from java/common/StructFactory.tpl
rename to qpid/java/common/StructFactory.tpl
diff --git a/java/common/Type.tpl b/qpid/java/common/Type.tpl
similarity index 100%
rename from java/common/Type.tpl
rename to qpid/java/common/Type.tpl
diff --git a/java/common/bin/qpid-jaddr b/qpid/java/common/bin/qpid-jaddr
similarity index 100%
rename from java/common/bin/qpid-jaddr
rename to qpid/java/common/bin/qpid-jaddr
diff --git a/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run
similarity index 100%
rename from java/common/bin/qpid-run
rename to qpid/java/common/bin/qpid-run
diff --git a/java/common/build.xml b/qpid/java/common/build.xml
similarity index 100%
rename from java/common/build.xml
rename to qpid/java/common/build.xml
diff --git a/java/common/codegen b/qpid/java/common/codegen
similarity index 100%
rename from java/common/codegen
rename to qpid/java/common/codegen
diff --git a/java/common/etc/qpid-run.conf b/qpid/java/common/etc/qpid-run.conf
similarity index 100%
rename from java/common/etc/qpid-run.conf
rename to qpid/java/common/etc/qpid-run.conf
diff --git a/java/common/etc/qpid-run.conf.dev b/qpid/java/common/etc/qpid-run.conf.dev
similarity index 100%
rename from java/common/etc/qpid-run.conf.dev
rename to qpid/java/common/etc/qpid-run.conf.dev
diff --git a/java/common/genutil.py b/qpid/java/common/genutil.py
similarity index 100%
rename from java/common/genutil.py
rename to qpid/java/common/genutil.py
diff --git a/java/common/protocol-version.xml b/qpid/java/common/protocol-version.xml
similarity index 100%
rename from java/common/protocol-version.xml
rename to qpid/java/common/protocol-version.xml
diff --git a/java/common/readme.txt b/qpid/java/common/readme.txt
similarity index 100%
rename from java/common/readme.txt
rename to qpid/java/common/readme.txt
diff --git a/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
similarity index 100%
rename from java/common/src/main/java/common.bnd
rename to qpid/java/common/src/main/java/common.bnd
diff --git a/java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java b/qpid/java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java
similarity index 100%
rename from java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java
rename to qpid/java/common/src/main/java/org/apache/configuration/PropertyNameResolver.java
diff --git a/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java b/qpid/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
rename to qpid/java/common/src/main/java/org/apache/mina/common/FixedSizeByteBufferAllocator.java
diff --git a/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java b/qpid/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
rename to qpid/java/common/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
diff --git a/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java b/qpid/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
rename to qpid/java/common/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java b/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
rename to qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferFullExeception.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java b/qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
rename to qpid/java/common/src/main/java/org/apache/mina/filter/WriteBufferLimitFilterBuilder.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java b/qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
rename to qpid/java/common/src/main/java/org/apache/mina/filter/codec/OurCumulativeProtocolDecoder.java
diff --git a/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java b/qpid/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
rename to qpid/java/common/src/main/java/org/apache/mina/filter/codec/QpidProtocolCodecFilter.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
rename to qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketAcceptor.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
rename to qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketConnector.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
rename to qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketFilterChain.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
rename to qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketIoProcessor.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
rename to qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionConfigImpl.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java b/qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
rename to qpid/java/common/src/main/java/org/apache/mina/transport/socket/nio/MultiThreadSocketSessionImpl.java
diff --git a/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java b/qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
similarity index 100%
rename from java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
rename to qpid/java/common/src/main/java/org/apache/mina/transport/vmpipe/QpidVmPipeConnector.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQChannelException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInternalException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQInternalException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQInternalException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQInternalException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQProtocolException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQProtocolException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQProtocolException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQProtocolException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQSecurityException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQSecurityException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQSecurityException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQSecurityException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQStoreException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQStoreException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQStoreException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQStoreException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQTimeoutException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQUnknownExchangeType.java
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
diff --git a/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java b/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
rename to qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
diff --git a/java/common/src/main/java/org/apache/qpid/QpidConfig.java b/qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/QpidConfig.java
rename to qpid/java/common/src/main/java/org/apache/qpid/QpidConfig.java
diff --git a/java/common/src/main/java/org/apache/qpid/SerialException.java b/qpid/java/common/src/main/java/org/apache/qpid/SerialException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/SerialException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/SerialException.java
diff --git a/java/common/src/main/java/org/apache/qpid/ToyBroker.java b/qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/ToyBroker.java
rename to qpid/java/common/src/main/java/org/apache/qpid/ToyBroker.java
diff --git a/java/common/src/main/java/org/apache/qpid/ToyClient.java b/qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/ToyClient.java
rename to qpid/java/common/src/main/java/org/apache/qpid/ToyClient.java
diff --git a/java/common/src/main/java/org/apache/qpid/ToyExchange.java b/qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/ToyExchange.java
rename to qpid/java/common/src/main/java/org/apache/qpid/ToyExchange.java
diff --git a/java/common/src/main/java/org/apache/qpid/api/Message.java b/qpid/java/common/src/main/java/org/apache/qpid/api/Message.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/api/Message.java
rename to qpid/java/common/src/main/java/org/apache/qpid/api/Message.java
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/codec/AMQCodecFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java b/qpid/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
rename to qpid/java/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
rename to qpid/java/common/src/main/java/org/apache/qpid/common/ClientProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/Closeable.java b/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/common/Closeable.java
rename to qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java
diff --git a/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
rename to qpid/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
rename to qpid/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
rename to qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Configured.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/configuration/Configured.java
rename to qpid/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
rename to qpid/java/common/src/main/java/org/apache/qpid/configuration/PropertyUtils.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
rename to qpid/java/common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Validator.java b/qpid/java/common/src/main/java/org/apache/qpid/configuration/Validator.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/configuration/Validator.java
rename to qpid/java/common/src/main/java/org/apache/qpid/configuration/Validator.java
diff --git a/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
rename to qpid/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java b/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
rename to qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrame.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQMethodFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQType.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQType.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/BodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/Content.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/Content.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/Content.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/Content.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/DeferredDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/HeartbeatBodyFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/SmallCompositeAMQDataBlock.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfo.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AMQMethodBody_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/AMQMethodBody_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AMQMethodBody_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
rename to qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/Address.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/Address.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/Address.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LexError.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexer.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/ParseError.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Parser.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
diff --git a/java/common/src/main/java/org/apache/qpid/messaging/util/Token.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Token.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/messaging/util/Token.java
rename to qpid/java/common/src/main/java/org/apache/qpid/messaging/util/Token.java
diff --git a/java/common/src/main/java/org/apache/qpid/pool/Job.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/Job.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/pool/Job.java
rename to qpid/java/common/src/main/java/org/apache/qpid/pool/Job.java
diff --git a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java
rename to qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteJobQueue.java
diff --git a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.java
rename to qpid/java/common/src/main/java/org/apache/qpid/pool/ReadWriteRunnable.java
diff --git a/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java b/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
rename to qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngineFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java b/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
rename to qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
diff --git a/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/security/AMQPCallbackHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/security/UsernamePasswordCallbackHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
rename to qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java
rename to qpid/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java
diff --git a/java/common/src/main/java/org/apache/qpid/thread/Threading.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/thread/Threading.java
rename to qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Binary.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Binary.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Binary.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Binding.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Binding.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Binding.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Connection.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Field.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Field.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Field.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Future.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Future.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Future.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Header.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Header.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Header.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Method.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Method.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Method.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/NetworkDriver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriver.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/NetworkDriver.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/NetworkDriverConfiguration.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/OpenException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/OpenException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/OpenException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/OpenException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolError.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ProtocolViolationException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolViolationException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ProtocolViolationException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ProtocolViolationException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Range.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Range.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Range.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/RangeSet.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Receiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Receiver.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Receiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Sender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Sender.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SenderException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SenderException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/SenderException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/SenderException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Session.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Session.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/SessionException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/SessionException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/SessionListener.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionListener.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/SessionListener.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/SessionListener.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Struct.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/Struct.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/Struct.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/TransportException.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/TransportException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/TransportException.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/ConnectionBinding.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/Frame.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/InputHandler_0_9.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/InputHandler_0_9.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/io/InputHandler_0_9.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/InputHandler_0_9.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoAcceptor.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioHandler.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/util/Functions.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/util/Logger.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/util/SliceIterator.java
diff --git a/java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java
rename to qpid/java/common/src/main/java/org/apache/qpid/transport/util/Waiter.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java b/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
rename to qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURL.java b/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/url/BindingURL.java
rename to qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java b/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
rename to qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLHelper.java b/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/url/URLHelper.java
rename to qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java b/qpid/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java b/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java b/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/FileUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/FileUtils.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/MessageQueue.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java b/qpid/java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/NameUUIDGen.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java b/qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java b/qpid/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/PrettyPrintingUtils.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java b/qpid/java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/Serial.java b/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/Serial.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/Strings.java b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/Strings.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/UUIDGen.java b/qpid/java/common/src/main/java/org/apache/qpid/util/UUIDGen.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/UUIDGen.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/UUIDGen.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/UUIDs.java b/qpid/java/common/src/main/java/org/apache/qpid/util/UUIDs.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/UUIDs.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/UUIDs.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/AlreadyUnblockedException.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueue.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BooleanLatch.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/Capacity.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchBuffer.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchQueue.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRecord.java
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java b/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java
similarity index 100%
rename from java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java
rename to qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchRef.java
diff --git a/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java b/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
similarity index 100%
rename from java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
rename to qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterClient.java
diff --git a/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java b/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java
similarity index 100%
rename from java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java
rename to qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/IOWriterServer.java
diff --git a/java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java b/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java b/qpid/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java
rename to qpid/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java b/qpid/java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/pool/ReferenceCountingExecutorServiceTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/session/TestSession.java b/qpid/java/common/src/test/java/org/apache/qpid/session/TestSession.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/session/TestSession.java
rename to qpid/java/common/src/test/java/org/apache/qpid/session/TestSession.java
diff --git a/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
rename to qpid/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
diff --git a/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java b/qpid/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/GenTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/GenTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/transport/GenTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/transport/GenTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
rename to qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/transport/network/mina/MINANetworkDriverTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/util/PropertyUtilsTest.java
diff --git a/java/common/src/test/java/org/apache/qpid/util/SerialTest.java b/qpid/java/common/src/test/java/org/apache/qpid/util/SerialTest.java
similarity index 100%
rename from java/common/src/test/java/org/apache/qpid/util/SerialTest.java
rename to qpid/java/common/src/test/java/org/apache/qpid/util/SerialTest.java
diff --git a/java/common/templates/method/MethodBodyInterface.vm b/qpid/java/common/templates/method/MethodBodyInterface.vm
similarity index 100%
rename from java/common/templates/method/MethodBodyInterface.vm
rename to qpid/java/common/templates/method/MethodBodyInterface.vm
diff --git a/java/common/templates/method/version/MethodBodyClass.vm b/qpid/java/common/templates/method/version/MethodBodyClass.vm
similarity index 100%
rename from java/common/templates/method/version/MethodBodyClass.vm
rename to qpid/java/common/templates/method/version/MethodBodyClass.vm
diff --git a/java/common/templates/model/ClientMethodDispatcherInterface.vm b/qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
similarity index 100%
rename from java/common/templates/model/ClientMethodDispatcherInterface.vm
rename to qpid/java/common/templates/model/ClientMethodDispatcherInterface.vm
diff --git a/java/common/templates/model/MethodDispatcherInterface.vm b/qpid/java/common/templates/model/MethodDispatcherInterface.vm
similarity index 100%
rename from java/common/templates/model/MethodDispatcherInterface.vm
rename to qpid/java/common/templates/model/MethodDispatcherInterface.vm
diff --git a/java/common/templates/model/MethodRegistryClass.vm b/qpid/java/common/templates/model/MethodRegistryClass.vm
similarity index 100%
rename from java/common/templates/model/MethodRegistryClass.vm
rename to qpid/java/common/templates/model/MethodRegistryClass.vm
diff --git a/java/common/templates/model/ProtocolVersionListClass.vm b/qpid/java/common/templates/model/ProtocolVersionListClass.vm
similarity index 100%
rename from java/common/templates/model/ProtocolVersionListClass.vm
rename to qpid/java/common/templates/model/ProtocolVersionListClass.vm
diff --git a/java/common/templates/model/ServerMethodDispatcherInterface.vm b/qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
similarity index 100%
rename from java/common/templates/model/ServerMethodDispatcherInterface.vm
rename to qpid/java/common/templates/model/ServerMethodDispatcherInterface.vm
diff --git a/java/common/templates/model/version/AmqpConstantsClass.vm b/qpid/java/common/templates/model/version/AmqpConstantsClass.vm
similarity index 100%
rename from java/common/templates/model/version/AmqpConstantsClass.vm
rename to qpid/java/common/templates/model/version/AmqpConstantsClass.vm
diff --git a/java/common/templates/model/version/ClientMethodDispatcherInterface.vm b/qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
similarity index 100%
rename from java/common/templates/model/version/ClientMethodDispatcherInterface.vm
rename to qpid/java/common/templates/model/version/ClientMethodDispatcherInterface.vm
diff --git a/java/common/templates/model/version/MethodDispatcherInterface.vm b/qpid/java/common/templates/model/version/MethodDispatcherInterface.vm
similarity index 100%
rename from java/common/templates/model/version/MethodDispatcherInterface.vm
rename to qpid/java/common/templates/model/version/MethodDispatcherInterface.vm
diff --git a/java/common/templates/model/version/MethodRegistryClass.vm b/qpid/java/common/templates/model/version/MethodRegistryClass.vm
similarity index 100%
rename from java/common/templates/model/version/MethodRegistryClass.vm
rename to qpid/java/common/templates/model/version/MethodRegistryClass.vm
diff --git a/java/common/templates/model/version/ServerMethodDispatcherInterface.vm b/qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
similarity index 100%
rename from java/common/templates/model/version/ServerMethodDispatcherInterface.vm
rename to qpid/java/common/templates/model/version/ServerMethodDispatcherInterface.vm
diff --git a/java/common/templating.py b/qpid/java/common/templating.py
similarity index 100%
rename from java/common/templating.py
rename to qpid/java/common/templating.py
diff --git a/java/doc/AMQBlazeDetailedDesign.vsd b/qpid/java/doc/AMQBlazeDetailedDesign.vsd
similarity index 100%
rename from java/doc/AMQBlazeDetailedDesign.vsd
rename to qpid/java/doc/AMQBlazeDetailedDesign.vsd
Binary files differ
diff --git a/java/doc/FramingClassDiagram.vsd b/qpid/java/doc/FramingClassDiagram.vsd
similarity index 100%
rename from java/doc/FramingClassDiagram.vsd
rename to qpid/java/doc/FramingClassDiagram.vsd
Binary files differ
diff --git a/java/doc/Qpid-architecture.dia b/qpid/java/doc/Qpid-architecture.dia
similarity index 100%
rename from java/doc/Qpid-architecture.dia
rename to qpid/java/doc/Qpid-architecture.dia
Binary files differ
diff --git a/java/doc/broker-0.5-network.dia b/qpid/java/doc/broker-0.5-network.dia
similarity index 100%
rename from java/doc/broker-0.5-network.dia
rename to qpid/java/doc/broker-0.5-network.dia
Binary files differ
diff --git a/java/doc/broker-0.N-network-phase-1.dia b/qpid/java/doc/broker-0.N-network-phase-1.dia
similarity index 100%
rename from java/doc/broker-0.N-network-phase-1.dia
rename to qpid/java/doc/broker-0.N-network-phase-1.dia
Binary files differ
diff --git a/java/doc/broker-0.N-state.dia b/qpid/java/doc/broker-0.N-state.dia
similarity index 100%
rename from java/doc/broker-0.N-state.dia
rename to qpid/java/doc/broker-0.N-state.dia
Binary files differ
diff --git a/java/doc/broker-overview.dia b/qpid/java/doc/broker-overview.dia
similarity index 100%
rename from java/doc/broker-overview.dia
rename to qpid/java/doc/broker-overview.dia
Binary files differ
diff --git a/java/doc/broker-priority-queue-subscription.dia b/qpid/java/doc/broker-priority-queue-subscription.dia
similarity index 100%
rename from java/doc/broker-priority-queue-subscription.dia
rename to qpid/java/doc/broker-priority-queue-subscription.dia
Binary files differ
diff --git a/java/doc/broker-queue-subscription.dia b/qpid/java/doc/broker-queue-subscription.dia
similarity index 100%
rename from java/doc/broker-queue-subscription.dia
rename to qpid/java/doc/broker-queue-subscription.dia
Binary files differ
diff --git a/java/doc/client-0.5-connection-creation.dia b/qpid/java/doc/client-0.5-connection-creation.dia
similarity index 100%
rename from java/doc/client-0.5-connection-creation.dia
rename to qpid/java/doc/client-0.5-connection-creation.dia
Binary files differ
diff --git a/java/doc/client-0.5-network-processing.dia b/qpid/java/doc/client-0.5-network-processing.dia
similarity index 100%
rename from java/doc/client-0.5-network-processing.dia
rename to qpid/java/doc/client-0.5-network-processing.dia
Binary files differ
diff --git a/java/doc/client-0.N-network-processing.dia b/qpid/java/doc/client-0.N-network-processing.dia
similarity index 100%
rename from java/doc/client-0.N-network-processing.dia
rename to qpid/java/doc/client-0.N-network-processing.dia
Binary files differ
diff --git a/java/doc/common-0.N-network.dia b/qpid/java/doc/common-0.N-network.dia
similarity index 100%
rename from java/doc/common-0.N-network.dia
rename to qpid/java/doc/common-0.N-network.dia
Binary files differ
diff --git a/java/doc/network-driver-protocol-engine-sequence.dia b/qpid/java/doc/network-driver-protocol-engine-sequence.dia
similarity index 100%
rename from java/doc/network-driver-protocol-engine-sequence.dia
rename to qpid/java/doc/network-driver-protocol-engine-sequence.dia
Binary files differ
diff --git a/java/doc/noddy-network-blocks.dia b/qpid/java/doc/noddy-network-blocks.dia
similarity index 100%
rename from java/doc/noddy-network-blocks.dia
rename to qpid/java/doc/noddy-network-blocks.dia
Binary files differ
diff --git a/java/etc/code-style.xml b/qpid/java/etc/code-style.xml
similarity index 100%
rename from java/etc/code-style.xml
rename to qpid/java/etc/code-style.xml
diff --git a/java/etc/coding_standards.xml b/qpid/java/etc/coding_standards.xml
similarity index 100%
rename from java/etc/coding_standards.xml
rename to qpid/java/etc/coding_standards.xml
diff --git a/java/etc/license_header.txt b/qpid/java/etc/license_header.txt
similarity index 100%
rename from java/etc/license_header.txt
rename to qpid/java/etc/license_header.txt
diff --git a/java/etc/log4j.xml b/qpid/java/etc/log4j.xml
similarity index 100%
rename from java/etc/log4j.xml
rename to qpid/java/etc/log4j.xml
diff --git a/java/genpom b/qpid/java/genpom
similarity index 100%
rename from java/genpom
rename to qpid/java/genpom
diff --git a/java/integrationtests/README.txt b/qpid/java/integrationtests/README.txt
similarity index 100%
rename from java/integrationtests/README.txt
rename to qpid/java/integrationtests/README.txt
diff --git a/java/integrationtests/bin/interoptests.py b/qpid/java/integrationtests/bin/interoptests.py
similarity index 100%
rename from java/integrationtests/bin/interoptests.py
rename to qpid/java/integrationtests/bin/interoptests.py
diff --git a/java/integrationtests/build.xml b/qpid/java/integrationtests/build.xml
similarity index 100%
rename from java/integrationtests/build.xml
rename to qpid/java/integrationtests/build.xml
diff --git a/java/integrationtests/docs/RunningSustainedTests.txt b/qpid/java/integrationtests/docs/RunningSustainedTests.txt
similarity index 100%
rename from java/integrationtests/docs/RunningSustainedTests.txt
rename to qpid/java/integrationtests/docs/RunningSustainedTests.txt
diff --git a/java/integrationtests/jar-with-dependencies.xml b/qpid/java/integrationtests/jar-with-dependencies.xml
similarity index 100%
rename from java/integrationtests/jar-with-dependencies.xml
rename to qpid/java/integrationtests/jar-with-dependencies.xml
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase1DummyRun.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase2BasicP2P.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase3BasicPubSub.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase4P2PMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/clienttestcases/TestCase5PubSubMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase1DummyRun.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase2BasicP2P.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase3BasicPubSub.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase4P2PMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/interop/testcases/InteropTestCase5PubSubMessageSize.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedClientTestCase.java
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java b/qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
similarity index 100%
rename from java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
rename to qpid/java/integrationtests/src/main/java/org/apache/qpid/sustained/SustainedTestCase.java
diff --git a/java/integrationtests/src/resources/sustained-log4j.xml b/qpid/java/integrationtests/src/resources/sustained-log4j.xml
similarity index 100%
rename from java/integrationtests/src/resources/sustained-log4j.xml
rename to qpid/java/integrationtests/src/resources/sustained-log4j.xml
diff --git a/java/ivy.xml b/qpid/java/ivy.xml
similarity index 100%
rename from java/ivy.xml
rename to qpid/java/ivy.xml
diff --git a/java/ivysettings-nexus.xml b/qpid/java/ivysettings-nexus.xml
similarity index 100%
rename from java/ivysettings-nexus.xml
rename to qpid/java/ivysettings-nexus.xml
diff --git a/java/junit-toolkit/build.xml b/qpid/java/junit-toolkit/build.xml
similarity index 100%
rename from java/junit-toolkit/build.xml
rename to qpid/java/junit-toolkit/build.xml
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/DefaultThreadFactory.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/PossibleDeadlockException.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/TestRunnable.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestCoordinator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/ThreadTestExample.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/concurrency/package.html
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestCase.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/AsymptoticTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BaseThrottle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/BatchedThrottle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/DurationTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/InstrumentedTest.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/NullResultPrinter.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ParameterVariationTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ScaledTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskAware.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SetupTaskHandler.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/ShutdownHookable.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/SleepThrottle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestResult.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TKTestRunner.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestRunnerImprovedErrorHandling.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TestThreadAware.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/Throttle.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingController.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/TimingControllerAware.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/WrappedSuiteTestDecorator.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/CSVTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/ConsoleTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/TKTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/XMLTestListener.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/listeners/package.html
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/package.html
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/CommandLineParser.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ContextualProperties.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/MathUtils.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/ParsedProperties.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/SizeOf.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/StackQueue.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestContextProperties.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/TestUtils.java
diff --git a/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html b/qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
similarity index 100%
rename from java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
rename to qpid/java/junit-toolkit/src/main/org/apache/qpid/junit/extensions/util/package.html
diff --git a/java/lib/backport-util-concurrent-2.2.jar b/qpid/java/lib/backport-util-concurrent-2.2.jar
similarity index 100%
rename from java/lib/backport-util-concurrent-2.2.jar
rename to qpid/java/lib/backport-util-concurrent-2.2.jar
Binary files differ
diff --git a/java/lib/bnd-0.0.384.jar b/qpid/java/lib/bnd-0.0.384.jar
similarity index 100%
rename from java/lib/bnd-0.0.384.jar
rename to qpid/java/lib/bnd-0.0.384.jar
Binary files differ
diff --git a/java/lib/cobertura/README.txt b/qpid/java/lib/cobertura/README.txt
similarity index 100%
rename from java/lib/cobertura/README.txt
rename to qpid/java/lib/cobertura/README.txt
diff --git a/java/lib/com.ibm.icu_3.8.1.v20080530.jar b/qpid/java/lib/com.ibm.icu_3.8.1.v20080530.jar
similarity index 100%
rename from java/lib/com.ibm.icu_3.8.1.v20080530.jar
rename to qpid/java/lib/com.ibm.icu_3.8.1.v20080530.jar
Binary files differ
diff --git a/java/lib/commons-beanutils-core-1.8.0.jar b/qpid/java/lib/commons-beanutils-core-1.8.0.jar
similarity index 100%
rename from java/lib/commons-beanutils-core-1.8.0.jar
rename to qpid/java/lib/commons-beanutils-core-1.8.0.jar
Binary files differ
diff --git a/java/lib/commons-cli-1.0.jar b/qpid/java/lib/commons-cli-1.0.jar
similarity index 100%
rename from java/lib/commons-cli-1.0.jar
rename to qpid/java/lib/commons-cli-1.0.jar
Binary files differ
diff --git a/java/lib/commons-codec-1.3.jar b/qpid/java/lib/commons-codec-1.3.jar
similarity index 100%
rename from java/lib/commons-codec-1.3.jar
rename to qpid/java/lib/commons-codec-1.3.jar
Binary files differ
diff --git a/java/lib/commons-collections-3.2.jar b/qpid/java/lib/commons-collections-3.2.jar
similarity index 100%
rename from java/lib/commons-collections-3.2.jar
rename to qpid/java/lib/commons-collections-3.2.jar
Binary files differ
diff --git a/java/lib/commons-configuration-1.6.jar b/qpid/java/lib/commons-configuration-1.6.jar
similarity index 100%
rename from java/lib/commons-configuration-1.6.jar
rename to qpid/java/lib/commons-configuration-1.6.jar
Binary files differ
diff --git a/java/lib/commons-digester-1.8.1.jar b/qpid/java/lib/commons-digester-1.8.1.jar
similarity index 100%
rename from java/lib/commons-digester-1.8.1.jar
rename to qpid/java/lib/commons-digester-1.8.1.jar
Binary files differ
diff --git a/java/lib/commons-lang-2.2.jar b/qpid/java/lib/commons-lang-2.2.jar
similarity index 100%
rename from java/lib/commons-lang-2.2.jar
rename to qpid/java/lib/commons-lang-2.2.jar
Binary files differ
diff --git a/java/lib/commons-logging-1.0.4.jar b/qpid/java/lib/commons-logging-1.0.4.jar
similarity index 100%
rename from java/lib/commons-logging-1.0.4.jar
rename to qpid/java/lib/commons-logging-1.0.4.jar
Binary files differ
diff --git a/java/lib/derby-10.6.1.0.jar b/qpid/java/lib/derby-10.6.1.0.jar
similarity index 100%
rename from java/lib/derby-10.6.1.0.jar
rename to qpid/java/lib/derby-10.6.1.0.jar
Binary files differ
diff --git a/java/lib/findbugs/README.txt b/qpid/java/lib/findbugs/README.txt
similarity index 100%
rename from java/lib/findbugs/README.txt
rename to qpid/java/lib/findbugs/README.txt
diff --git a/java/lib/geronimo-jms_1.1_spec-1.0.jar b/qpid/java/lib/geronimo-jms_1.1_spec-1.0.jar
similarity index 100%
rename from java/lib/geronimo-jms_1.1_spec-1.0.jar
rename to qpid/java/lib/geronimo-jms_1.1_spec-1.0.jar
Binary files differ
diff --git a/java/lib/ivy/README.txt b/qpid/java/lib/ivy/README.txt
similarity index 100%
rename from java/lib/ivy/README.txt
rename to qpid/java/lib/ivy/README.txt
diff --git a/java/lib/javacc.jar b/qpid/java/lib/javacc.jar
similarity index 100%
rename from java/lib/javacc.jar
rename to qpid/java/lib/javacc.jar
Binary files differ
diff --git a/java/lib/jetty-6.1.14.jar b/qpid/java/lib/jetty-6.1.14.jar
similarity index 100%
rename from java/lib/jetty-6.1.14.jar
rename to qpid/java/lib/jetty-6.1.14.jar
Binary files differ
diff --git a/java/lib/jetty-servlet-tester-6.1.14.jar b/qpid/java/lib/jetty-servlet-tester-6.1.14.jar
similarity index 100%
rename from java/lib/jetty-servlet-tester-6.1.14.jar
rename to qpid/java/lib/jetty-servlet-tester-6.1.14.jar
Binary files differ
diff --git a/java/lib/jetty-util-6.1.14.jar b/qpid/java/lib/jetty-util-6.1.14.jar
similarity index 100%
rename from java/lib/jetty-util-6.1.14.jar
rename to qpid/java/lib/jetty-util-6.1.14.jar
Binary files differ
diff --git a/java/lib/junit-3.8.1.jar b/qpid/java/lib/junit-3.8.1.jar
similarity index 100%
rename from java/lib/junit-3.8.1.jar
rename to qpid/java/lib/junit-3.8.1.jar
Binary files differ
diff --git a/java/lib/jython-2.5.0.jar b/qpid/java/lib/jython-2.5.0.jar
similarity index 100%
rename from java/lib/jython-2.5.0.jar
rename to qpid/java/lib/jython-2.5.0.jar
Binary files differ
diff --git a/java/lib/log4j-1.2.12.jar b/qpid/java/lib/log4j-1.2.12.jar
similarity index 100%
rename from java/lib/log4j-1.2.12.jar
rename to qpid/java/lib/log4j-1.2.12.jar
Binary files differ
diff --git a/java/lib/maven-ant-tasks-2.1.1.jar b/qpid/java/lib/maven-ant-tasks-2.1.1.jar
similarity index 100%
rename from java/lib/maven-ant-tasks-2.1.1.jar
rename to qpid/java/lib/maven-ant-tasks-2.1.1.jar
Binary files differ
diff --git a/java/lib/mina-core-1.0.1.jar b/qpid/java/lib/mina-core-1.0.1.jar
similarity index 100%
rename from java/lib/mina-core-1.0.1.jar
rename to qpid/java/lib/mina-core-1.0.1.jar
Binary files differ
diff --git a/java/lib/mina-filter-ssl-1.0.1.jar b/qpid/java/lib/mina-filter-ssl-1.0.1.jar
similarity index 100%
rename from java/lib/mina-filter-ssl-1.0.1.jar
rename to qpid/java/lib/mina-filter-ssl-1.0.1.jar
Binary files differ
diff --git a/java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar b/qpid/java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
similarity index 100%
rename from java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
rename to qpid/java/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
Binary files differ
diff --git a/java/lib/org.apache.felix.framework-2.0.5.jar b/qpid/java/lib/org.apache.felix.framework-2.0.5.jar
similarity index 100%
rename from java/lib/org.apache.felix.framework-2.0.5.jar
rename to qpid/java/lib/org.apache.felix.framework-2.0.5.jar
Binary files differ
diff --git a/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar b/qpid/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
similarity index 100%
rename from java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
rename to qpid/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
Binary files differ
diff --git a/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar b/qpid/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
similarity index 100%
rename from java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
rename to qpid/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
Binary files differ
diff --git a/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar b/qpid/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
similarity index 100%
rename from java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
rename to qpid/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
Binary files differ
diff --git a/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar b/qpid/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
similarity index 100%
rename from java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
rename to qpid/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
Binary files differ
diff --git a/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar b/qpid/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
similarity index 100%
rename from java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
rename to qpid/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
Binary files differ
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
similarity index 100%
rename from java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
rename to qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
Binary files differ
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
similarity index 100%
rename from java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
rename to qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
similarity index 100%
rename from java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
rename to qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
similarity index 100%
rename from java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
rename to qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
similarity index 100%
rename from java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
rename to qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
similarity index 100%
rename from java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
rename to qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
similarity index 100%
rename from java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
rename to qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
Binary files differ
diff --git a/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar b/qpid/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
similarity index 100%
rename from java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
rename to qpid/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar b/qpid/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
similarity index 100%
rename from java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
rename to qpid/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar b/qpid/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
similarity index 100%
rename from java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
rename to qpid/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
rename to qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
rename to qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
rename to qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
rename to qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
rename to qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
rename to qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/eclipse_1115.so
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties b/qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
rename to qpid/java/lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/launcher.carbon.macosx.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/eclipse_1115.so
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.0.101.R34x_v20080731/launcher.gtk.linux.x86_64.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/eclipse_1115.so
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties
rename to qpid/java/lib/org.eclipse.equinox.launcher.gtk.solaris.sparc_1.0.101.R34x_v20080731/launcher.gtk.solaris.sparc.properties
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
rename to qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
rename to qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
rename to qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
rename to qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
rename to qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
rename to qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties
rename to qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties
diff --git a/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar b/qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
similarity index 100%
rename from java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
rename to qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar b/qpid/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
similarity index 100%
rename from java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
rename to qpid/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
Binary files differ
diff --git a/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar b/qpid/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
similarity index 100%
rename from java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
rename to qpid/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
Binary files differ
diff --git a/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar b/qpid/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
similarity index 100%
rename from java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
rename to qpid/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
Binary files differ
diff --git a/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar b/qpid/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
similarity index 100%
rename from java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
rename to qpid/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
Binary files differ
diff --git a/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar b/qpid/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
similarity index 100%
rename from java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
rename to qpid/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
Binary files differ
diff --git a/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar b/qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
similarity index 100%
rename from java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
rename to qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
Binary files differ
diff --git a/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
similarity index 100%
rename from java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
rename to qpid/java/lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
Binary files differ
diff --git a/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
similarity index 100%
rename from java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
rename to qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
Binary files differ
diff --git a/java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar
similarity index 100%
rename from java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar
rename to qpid/java/lib/org.eclipse.swt.gtk.linux.x86_64_3.4.1.v3449c.jar
Binary files differ
diff --git a/java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar
similarity index 100%
rename from java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar
rename to qpid/java/lib/org.eclipse.swt.gtk.solaris.sparc_3.4.1.v3449c.jar
Binary files differ
diff --git a/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
similarity index 100%
rename from java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
rename to qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
Binary files differ
diff --git a/java/lib/org.eclipse.swt_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar
similarity index 100%
rename from java/lib/org.eclipse.swt_3.4.1.v3449c.jar
rename to qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar
Binary files differ
diff --git a/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar b/qpid/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
similarity index 100%
rename from java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
rename to qpid/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
Binary files differ
diff --git a/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar b/qpid/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
similarity index 100%
rename from java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
rename to qpid/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
Binary files differ
diff --git a/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar b/qpid/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
similarity index 100%
rename from java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
rename to qpid/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
Binary files differ
diff --git a/java/lib/poms/backport-util-concurrent-2.2.xml b/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
similarity index 100%
rename from java/lib/poms/backport-util-concurrent-2.2.xml
rename to qpid/java/lib/poms/backport-util-concurrent-2.2.xml
diff --git a/java/lib/poms/commons-beanutils-core-1.8.0.xml b/qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
similarity index 100%
rename from java/lib/poms/commons-beanutils-core-1.8.0.xml
rename to qpid/java/lib/poms/commons-beanutils-core-1.8.0.xml
diff --git a/java/lib/poms/commons-cli-1.0.xml b/qpid/java/lib/poms/commons-cli-1.0.xml
similarity index 100%
rename from java/lib/poms/commons-cli-1.0.xml
rename to qpid/java/lib/poms/commons-cli-1.0.xml
diff --git a/java/lib/poms/commons-codec-1.3.xml b/qpid/java/lib/poms/commons-codec-1.3.xml
similarity index 100%
rename from java/lib/poms/commons-codec-1.3.xml
rename to qpid/java/lib/poms/commons-codec-1.3.xml
diff --git a/java/lib/poms/commons-collections-3.2.xml b/qpid/java/lib/poms/commons-collections-3.2.xml
similarity index 100%
rename from java/lib/poms/commons-collections-3.2.xml
rename to qpid/java/lib/poms/commons-collections-3.2.xml
diff --git a/java/lib/poms/commons-configuration-1.6.xml b/qpid/java/lib/poms/commons-configuration-1.6.xml
similarity index 100%
rename from java/lib/poms/commons-configuration-1.6.xml
rename to qpid/java/lib/poms/commons-configuration-1.6.xml
diff --git a/java/lib/poms/commons-digester-1.8.1.xml b/qpid/java/lib/poms/commons-digester-1.8.1.xml
similarity index 100%
rename from java/lib/poms/commons-digester-1.8.1.xml
rename to qpid/java/lib/poms/commons-digester-1.8.1.xml
diff --git a/java/lib/poms/commons-lang-2.2.xml b/qpid/java/lib/poms/commons-lang-2.2.xml
similarity index 100%
rename from java/lib/poms/commons-lang-2.2.xml
rename to qpid/java/lib/poms/commons-lang-2.2.xml
diff --git a/java/lib/poms/commons-logging-1.0.4.xml b/qpid/java/lib/poms/commons-logging-1.0.4.xml
similarity index 100%
rename from java/lib/poms/commons-logging-1.0.4.xml
rename to qpid/java/lib/poms/commons-logging-1.0.4.xml
diff --git a/java/lib/poms/commons-pool-1.4.xml b/qpid/java/lib/poms/commons-pool-1.4.xml
similarity index 100%
rename from java/lib/poms/commons-pool-1.4.xml
rename to qpid/java/lib/poms/commons-pool-1.4.xml
diff --git a/java/lib/poms/derby-10.6.1.0.xml b/qpid/java/lib/poms/derby-10.6.1.0.xml
similarity index 100%
rename from java/lib/poms/derby-10.6.1.0.xml
rename to qpid/java/lib/poms/derby-10.6.1.0.xml
diff --git a/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml b/qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
similarity index 100%
rename from java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
rename to qpid/java/lib/poms/geronimo-jms_1.1_spec-1.0.xml
diff --git a/java/lib/poms/junit-3.8.1.xml b/qpid/java/lib/poms/junit-3.8.1.xml
similarity index 100%
rename from java/lib/poms/junit-3.8.1.xml
rename to qpid/java/lib/poms/junit-3.8.1.xml
diff --git a/java/lib/poms/log4j-1.2.12.xml b/qpid/java/lib/poms/log4j-1.2.12.xml
similarity index 100%
rename from java/lib/poms/log4j-1.2.12.xml
rename to qpid/java/lib/poms/log4j-1.2.12.xml
diff --git a/java/lib/poms/mina-core-1.0.1.xml b/qpid/java/lib/poms/mina-core-1.0.1.xml
similarity index 100%
rename from java/lib/poms/mina-core-1.0.1.xml
rename to qpid/java/lib/poms/mina-core-1.0.1.xml
diff --git a/java/lib/poms/mina-filter-ssl-1.0.1.xml b/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
similarity index 100%
rename from java/lib/poms/mina-filter-ssl-1.0.1.xml
rename to qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
diff --git a/java/lib/poms/org.apache.felix.framework-2.0.5.xml b/qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml
similarity index 100%
rename from java/lib/poms/org.apache.felix.framework-2.0.5.xml
rename to qpid/java/lib/poms/org.apache.felix.framework-2.0.5.xml
diff --git a/java/lib/poms/org.osgi.core-1.0.0.xml b/qpid/java/lib/poms/org.osgi.core-1.0.0.xml
similarity index 100%
rename from java/lib/poms/org.osgi.core-1.0.0.xml
rename to qpid/java/lib/poms/org.osgi.core-1.0.0.xml
diff --git a/java/lib/poms/slf4j-api-1.6.1.xml b/qpid/java/lib/poms/slf4j-api-1.6.1.xml
similarity index 100%
rename from java/lib/poms/slf4j-api-1.6.1.xml
rename to qpid/java/lib/poms/slf4j-api-1.6.1.xml
diff --git a/java/lib/poms/slf4j-log4j12-1.6.1.xml b/qpid/java/lib/poms/slf4j-log4j12-1.6.1.xml
similarity index 100%
rename from java/lib/poms/slf4j-log4j12-1.6.1.xml
rename to qpid/java/lib/poms/slf4j-log4j12-1.6.1.xml
diff --git a/java/lib/poms/xalan-2.7.0.xml b/qpid/java/lib/poms/xalan-2.7.0.xml
similarity index 100%
rename from java/lib/poms/xalan-2.7.0.xml
rename to qpid/java/lib/poms/xalan-2.7.0.xml
diff --git a/java/lib/servlet-api.jar b/qpid/java/lib/servlet-api.jar
similarity index 100%
rename from java/lib/servlet-api.jar
rename to qpid/java/lib/servlet-api.jar
Binary files differ
diff --git a/java/lib/slf4j-api-1.6.1.jar b/qpid/java/lib/slf4j-api-1.6.1.jar
similarity index 100%
rename from java/lib/slf4j-api-1.6.1.jar
rename to qpid/java/lib/slf4j-api-1.6.1.jar
Binary files differ
diff --git a/java/lib/slf4j-log4j12-1.6.1.jar b/qpid/java/lib/slf4j-log4j12-1.6.1.jar
similarity index 100%
rename from java/lib/slf4j-log4j12-1.6.1.jar
rename to qpid/java/lib/slf4j-log4j12-1.6.1.jar
Binary files differ
diff --git a/java/lib/xalan-2.7.0.jar b/qpid/java/lib/xalan-2.7.0.jar
similarity index 100%
rename from java/lib/xalan-2.7.0.jar
rename to qpid/java/lib/xalan-2.7.0.jar
Binary files differ
diff --git a/java/management/common/build.xml b/qpid/java/management/common/build.xml
similarity index 100%
rename from java/management/common/build.xml
rename to qpid/java/management/common/build.xml
diff --git a/java/management/common/src/main/java/management-common.bnd b/qpid/java/management/common/src/main/java/management-common.bnd
similarity index 100%
rename from java/management/common/src/main/java/management-common.bnd
rename to qpid/java/management/common/src/main/java/management-common.bnd
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
similarity index 100%
rename from java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
rename to qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
diff --git a/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java b/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
similarity index 100%
rename from java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
rename to qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
diff --git a/java/management/eclipse-plugin/META-INF/MANIFEST.MF b/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
similarity index 100%
rename from java/management/eclipse-plugin/META-INF/MANIFEST.MF
rename to qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
diff --git a/java/management/eclipse-plugin/build-release-common.properties b/qpid/java/management/eclipse-plugin/build-release-common.properties
similarity index 100%
rename from java/management/eclipse-plugin/build-release-common.properties
rename to qpid/java/management/eclipse-plugin/build-release-common.properties
diff --git a/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
similarity index 100%
rename from java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
rename to qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
diff --git a/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
similarity index 100%
rename from java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
rename to qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
diff --git a/java/management/eclipse-plugin/build-release-macosx.properties b/qpid/java/management/eclipse-plugin/build-release-macosx.properties
similarity index 100%
rename from java/management/eclipse-plugin/build-release-macosx.properties
rename to qpid/java/management/eclipse-plugin/build-release-macosx.properties
diff --git a/java/management/eclipse-plugin/build-release-macosx.xml b/qpid/java/management/eclipse-plugin/build-release-macosx.xml
similarity index 100%
rename from java/management/eclipse-plugin/build-release-macosx.xml
rename to qpid/java/management/eclipse-plugin/build-release-macosx.xml
diff --git a/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties b/qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
similarity index 100%
rename from java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
rename to qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
diff --git a/java/management/eclipse-plugin/build-release-win32-win32-x86.properties b/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
similarity index 100%
rename from java/management/eclipse-plugin/build-release-win32-win32-x86.properties
rename to qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
diff --git a/java/management/eclipse-plugin/build-release.xml b/qpid/java/management/eclipse-plugin/build-release.xml
similarity index 100%
rename from java/management/eclipse-plugin/build-release.xml
rename to qpid/java/management/eclipse-plugin/build-release.xml
diff --git a/java/management/eclipse-plugin/build.xml b/qpid/java/management/eclipse-plugin/build.xml
similarity index 100%
rename from java/management/eclipse-plugin/build.xml
rename to qpid/java/management/eclipse-plugin/build.xml
diff --git a/java/management/eclipse-plugin/icons/add.gif b/qpid/java/management/eclipse-plugin/icons/add.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/add.gif
rename to qpid/java/management/eclipse-plugin/icons/add.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/back.gif b/qpid/java/management/eclipse-plugin/icons/back.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/back.gif
rename to qpid/java/management/eclipse-plugin/icons/back.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/configuration_management.gif b/qpid/java/management/eclipse-plugin/icons/configuration_management.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/configuration_management.gif
rename to qpid/java/management/eclipse-plugin/icons/configuration_management.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/delete.gif b/qpid/java/management/eclipse-plugin/icons/delete.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/delete.gif
rename to qpid/java/management/eclipse-plugin/icons/delete.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/failure.gif b/qpid/java/management/eclipse-plugin/icons/failure.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/failure.gif
rename to qpid/java/management/eclipse-plugin/icons/failure.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif b/qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
rename to qpid/java/management/eclipse-plugin/icons/icon_ClosedFolder.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/icon_OpenFolder.gif b/qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/icon_OpenFolder.gif
rename to qpid/java/management/eclipse-plugin/icons/icon_OpenFolder.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/logging_management.gif b/qpid/java/management/eclipse-plugin/icons/logging_management.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/logging_management.gif
rename to qpid/java/management/eclipse-plugin/icons/logging_management.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/mbean_view.png b/qpid/java/management/eclipse-plugin/icons/mbean_view.png
similarity index 100%
rename from java/management/eclipse-plugin/icons/mbean_view.png
rename to qpid/java/management/eclipse-plugin/icons/mbean_view.png
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/notifications.gif b/qpid/java/management/eclipse-plugin/icons/notifications.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/notifications.gif
rename to qpid/java/management/eclipse-plugin/icons/notifications.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/qpidConnections.gif b/qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/qpidConnections.gif
rename to qpid/java/management/eclipse-plugin/icons/qpidConnections.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/qpidmc.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/qpidmc.gif
rename to qpid/java/management/eclipse-plugin/icons/qpidmc.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/qpidmc16.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc16.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/qpidmc16.gif
rename to qpid/java/management/eclipse-plugin/icons/qpidmc16.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/qpidmc32.bmp b/qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp
similarity index 100%
rename from java/management/eclipse-plugin/icons/qpidmc32.bmp
rename to qpid/java/management/eclipse-plugin/icons/qpidmc32.bmp
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/qpidmc32.gif b/qpid/java/management/eclipse-plugin/icons/qpidmc32.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/qpidmc32.gif
rename to qpid/java/management/eclipse-plugin/icons/qpidmc32.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/reconnect.gif b/qpid/java/management/eclipse-plugin/icons/reconnect.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/reconnect.gif
rename to qpid/java/management/eclipse-plugin/icons/reconnect.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/refresh.gif b/qpid/java/management/eclipse-plugin/icons/refresh.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/refresh.gif
rename to qpid/java/management/eclipse-plugin/icons/refresh.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/server_information.gif b/qpid/java/management/eclipse-plugin/icons/server_information.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/server_information.gif
rename to qpid/java/management/eclipse-plugin/icons/server_information.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/splash.bmp b/qpid/java/management/eclipse-plugin/icons/splash.bmp
similarity index 100%
rename from java/management/eclipse-plugin/icons/splash.bmp
rename to qpid/java/management/eclipse-plugin/icons/splash.bmp
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/stop.gif b/qpid/java/management/eclipse-plugin/icons/stop.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/stop.gif
rename to qpid/java/management/eclipse-plugin/icons/stop.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/success.gif b/qpid/java/management/eclipse-plugin/icons/success.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/success.gif
rename to qpid/java/management/eclipse-plugin/icons/success.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/user_management.gif b/qpid/java/management/eclipse-plugin/icons/user_management.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/user_management.gif
rename to qpid/java/management/eclipse-plugin/icons/user_management.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/icons/virtualhost_manager.gif b/qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
similarity index 100%
rename from java/management/eclipse-plugin/icons/virtualhost_manager.gif
rename to qpid/java/management/eclipse-plugin/icons/virtualhost_manager.gif
Binary files differ
diff --git a/java/management/eclipse-plugin/plugin.properties b/qpid/java/management/eclipse-plugin/plugin.properties
similarity index 100%
rename from java/management/eclipse-plugin/plugin.properties
rename to qpid/java/management/eclipse-plugin/plugin.properties
diff --git a/java/management/eclipse-plugin/plugin.xml b/qpid/java/management/eclipse-plugin/plugin.xml
similarity index 100%
rename from java/management/eclipse-plugin/plugin.xml
rename to qpid/java/management/eclipse-plugin/plugin.xml
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Activator.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApiVersion.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Application.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationActionBarAdvisor.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchAdvisor.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AbstractAction.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/CloseConnection.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/Refresh.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/RemoveServer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/InfoRequiredException.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/exceptions/ManagementConsoleException.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientNotificationListener.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXManagedObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationInfoModel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationDataModel.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/INotificationViewer.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanTabFolderFactory.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NumberVerifyListener.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/TreeObject.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableContentProvider.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableLabelProvider.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/LoggingTableSorter.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
similarity index 100%
rename from java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
rename to qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
diff --git a/java/management/eclipse-plugin/src/main/resources/.eclipseproduct b/qpid/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/.eclipseproduct
rename to qpid/java/management/eclipse-plugin/src/main/resources/.eclipseproduct
diff --git a/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF b/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
rename to qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/libcairo-swt.so
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86_64/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
rename to qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
rename to qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns
rename to qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm
rename to qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.l.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm
rename to qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.m.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm
rename to qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.s.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm
rename to qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/Qpidmc.t.pm
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc
rename to qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/solaris-gtk-sparc/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
rename to qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
Binary files differ
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
similarity index 100%
rename from java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
rename to qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
similarity index 100%
rename from java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
rename to qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
similarity index 100%
rename from java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
rename to qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java b/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
similarity index 100%
rename from java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
rename to qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
diff --git a/java/management/example/build.xml b/qpid/java/management/example/build.xml
similarity index 100%
rename from java/management/example/build.xml
rename to qpid/java/management/example/build.xml
diff --git a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
similarity index 100%
rename from java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
rename to qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
diff --git a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
similarity index 100%
rename from java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
rename to qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
diff --git a/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java b/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
similarity index 100%
rename from java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
rename to qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
diff --git a/java/maven-settings.xml b/qpid/java/maven-settings.xml
similarity index 100%
rename from java/maven-settings.xml
rename to qpid/java/maven-settings.xml
diff --git a/java/module.xml b/qpid/java/module.xml
similarity index 100%
rename from java/module.xml
rename to qpid/java/module.xml
diff --git a/java/perftests/RunningPerformanceTests.txt b/qpid/java/perftests/RunningPerformanceTests.txt
similarity index 100%
rename from java/perftests/RunningPerformanceTests.txt
rename to qpid/java/perftests/RunningPerformanceTests.txt
diff --git a/java/perftests/bin/monitoring/monitor-broker.sh b/qpid/java/perftests/bin/monitoring/monitor-broker.sh
similarity index 100%
rename from java/perftests/bin/monitoring/monitor-broker.sh
rename to qpid/java/perftests/bin/monitoring/monitor-broker.sh
diff --git a/java/perftests/bin/monitoring/runTests.sh b/qpid/java/perftests/bin/monitoring/runTests.sh
similarity index 100%
rename from java/perftests/bin/monitoring/runTests.sh
rename to qpid/java/perftests/bin/monitoring/runTests.sh
diff --git a/java/perftests/bin/monitoring/stop-monitored-broker.sh b/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh
similarity index 100%
rename from java/perftests/bin/monitoring/stop-monitored-broker.sh
rename to qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh
diff --git a/java/perftests/bin/processing/process.sh b/qpid/java/perftests/bin/processing/process.sh
similarity index 100%
rename from java/perftests/bin/processing/process.sh
rename to qpid/java/perftests/bin/processing/process.sh
diff --git a/java/perftests/bin/processing/processAll.sh b/qpid/java/perftests/bin/processing/processAll.sh
similarity index 100%
rename from java/perftests/bin/processing/processAll.sh
rename to qpid/java/perftests/bin/processing/processAll.sh
diff --git a/java/perftests/bin/processing/processTests.py b/qpid/java/perftests/bin/processing/processTests.py
similarity index 100%
rename from java/perftests/bin/processing/processTests.py
rename to qpid/java/perftests/bin/processing/processTests.py
diff --git a/java/perftests/bin/run_many.sh b/qpid/java/perftests/bin/run_many.sh
similarity index 100%
rename from java/perftests/bin/run_many.sh
rename to qpid/java/perftests/bin/run_many.sh
diff --git a/java/perftests/bin/topicListener.sh b/qpid/java/perftests/bin/topicListener.sh
similarity index 100%
rename from java/perftests/bin/topicListener.sh
rename to qpid/java/perftests/bin/topicListener.sh
diff --git a/java/perftests/bin/topicPublisher.sh b/qpid/java/perftests/bin/topicPublisher.sh
similarity index 100%
rename from java/perftests/bin/topicPublisher.sh
rename to qpid/java/perftests/bin/topicPublisher.sh
diff --git a/java/perftests/build.xml b/qpid/java/perftests/build.xml
similarity index 100%
rename from java/perftests/build.xml
rename to qpid/java/perftests/build.xml
diff --git a/java/perftests/dist-zip.xml b/qpid/java/perftests/dist-zip.xml
similarity index 100%
rename from java/perftests/dist-zip.xml
rename to qpid/java/perftests/dist-zip.xml
diff --git a/java/perftests/etc/jndi/activemq.properties b/qpid/java/perftests/etc/jndi/activemq.properties
similarity index 100%
rename from java/perftests/etc/jndi/activemq.properties
rename to qpid/java/perftests/etc/jndi/activemq.properties
diff --git a/java/perftests/etc/jndi/failovertest.properties b/qpid/java/perftests/etc/jndi/failovertest.properties
similarity index 100%
rename from java/perftests/etc/jndi/failovertest.properties
rename to qpid/java/perftests/etc/jndi/failovertest.properties
diff --git a/java/perftests/etc/jndi/perftests.properties b/qpid/java/perftests/etc/jndi/perftests.properties
similarity index 100%
rename from java/perftests/etc/jndi/perftests.properties
rename to qpid/java/perftests/etc/jndi/perftests.properties
diff --git a/java/perftests/etc/jndi/swiftmq.properties b/qpid/java/perftests/etc/jndi/swiftmq.properties
similarity index 100%
rename from java/perftests/etc/jndi/swiftmq.properties
rename to qpid/java/perftests/etc/jndi/swiftmq.properties
diff --git a/java/perftests/etc/perftests.log4j b/qpid/java/perftests/etc/perftests.log4j
similarity index 100%
rename from java/perftests/etc/perftests.log4j
rename to qpid/java/perftests/etc/perftests.log4j
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-1.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh
similarity index 100%
rename from java/perftests/etc/scripts/CTQ-Qpid-1.sh
rename to qpid/java/perftests/etc/scripts/CTQ-Qpid-1.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-2.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh
similarity index 100%
rename from java/perftests/etc/scripts/CTQ-Qpid-2.sh
rename to qpid/java/perftests/etc/scripts/CTQ-Qpid-2.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-3.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh
similarity index 100%
rename from java/perftests/etc/scripts/CTQ-Qpid-3.sh
rename to qpid/java/perftests/etc/scripts/CTQ-Qpid-3.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-4.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh
similarity index 100%
rename from java/perftests/etc/scripts/CTQ-Qpid-4.sh
rename to qpid/java/perftests/etc/scripts/CTQ-Qpid-4.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-5.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh
similarity index 100%
rename from java/perftests/etc/scripts/CTQ-Qpid-5.sh
rename to qpid/java/perftests/etc/scripts/CTQ-Qpid-5.sh
diff --git a/java/perftests/etc/scripts/CTQ-Qpid-6.sh b/qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh
similarity index 100%
rename from java/perftests/etc/scripts/CTQ-Qpid-6.sh
rename to qpid/java/perftests/etc/scripts/CTQ-Qpid-6.sh
diff --git a/java/perftests/etc/scripts/Connections.sh b/qpid/java/perftests/etc/scripts/Connections.sh
similarity index 100%
rename from java/perftests/etc/scripts/Connections.sh
rename to qpid/java/perftests/etc/scripts/Connections.sh
diff --git a/java/perftests/etc/scripts/JobQueue.sh b/qpid/java/perftests/etc/scripts/JobQueue.sh
similarity index 100%
rename from java/perftests/etc/scripts/JobQueue.sh
rename to qpid/java/perftests/etc/scripts/JobQueue.sh
diff --git a/java/perftests/etc/scripts/Latency.sh b/qpid/java/perftests/etc/scripts/Latency.sh
similarity index 100%
rename from java/perftests/etc/scripts/Latency.sh
rename to qpid/java/perftests/etc/scripts/Latency.sh
diff --git a/java/perftests/etc/scripts/MessageSize.sh b/qpid/java/perftests/etc/scripts/MessageSize.sh
similarity index 100%
rename from java/perftests/etc/scripts/MessageSize.sh
rename to qpid/java/perftests/etc/scripts/MessageSize.sh
diff --git a/java/perftests/etc/scripts/PT-Qpid-13.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
similarity index 100%
rename from java/perftests/etc/scripts/PT-Qpid-13.sh
rename to qpid/java/perftests/etc/scripts/PT-Qpid-13.sh
diff --git a/java/perftests/etc/scripts/PT-Qpid-14.sh b/qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
similarity index 100%
rename from java/perftests/etc/scripts/PT-Qpid-14.sh
rename to qpid/java/perftests/etc/scripts/PT-Qpid-14.sh
diff --git a/java/perftests/etc/scripts/Reliability.sh b/qpid/java/perftests/etc/scripts/Reliability.sh
similarity index 100%
rename from java/perftests/etc/scripts/Reliability.sh
rename to qpid/java/perftests/etc/scripts/Reliability.sh
diff --git a/java/perftests/etc/scripts/RunAll.sh b/qpid/java/perftests/etc/scripts/RunAll.sh
similarity index 100%
rename from java/perftests/etc/scripts/RunAll.sh
rename to qpid/java/perftests/etc/scripts/RunAll.sh
diff --git a/java/perftests/etc/scripts/RunCore.sh b/qpid/java/perftests/etc/scripts/RunCore.sh
similarity index 100%
rename from java/perftests/etc/scripts/RunCore.sh
rename to qpid/java/perftests/etc/scripts/RunCore.sh
diff --git a/java/perftests/etc/scripts/Test-ActiveMQ.sh b/qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
similarity index 100%
rename from java/perftests/etc/scripts/Test-ActiveMQ.sh
rename to qpid/java/perftests/etc/scripts/Test-ActiveMQ.sh
diff --git a/java/perftests/etc/scripts/Test-SwiftMQ.sh b/qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
similarity index 100%
rename from java/perftests/etc/scripts/Test-SwiftMQ.sh
rename to qpid/java/perftests/etc/scripts/Test-SwiftMQ.sh
diff --git a/java/perftests/etc/scripts/Throughput.sh b/qpid/java/perftests/etc/scripts/Throughput.sh
similarity index 100%
rename from java/perftests/etc/scripts/Throughput.sh
rename to qpid/java/perftests/etc/scripts/Throughput.sh
diff --git a/java/perftests/etc/scripts/drainBroker.sh b/qpid/java/perftests/etc/scripts/drainBroker.sh
similarity index 100%
rename from java/perftests/etc/scripts/drainBroker.sh
rename to qpid/java/perftests/etc/scripts/drainBroker.sh
diff --git a/java/perftests/etc/scripts/extractResults.sh b/qpid/java/perftests/etc/scripts/extractResults.sh
similarity index 100%
rename from java/perftests/etc/scripts/extractResults.sh
rename to qpid/java/perftests/etc/scripts/extractResults.sh
diff --git a/java/perftests/etc/scripts/extractThroughputResults.sh b/qpid/java/perftests/etc/scripts/extractThroughputResults.sh
similarity index 100%
rename from java/perftests/etc/scripts/extractThroughputResults.sh
rename to qpid/java/perftests/etc/scripts/extractThroughputResults.sh
diff --git a/java/perftests/etc/scripts/fillBroker.sh b/qpid/java/perftests/etc/scripts/fillBroker.sh
similarity index 100%
rename from java/perftests/etc/scripts/fillBroker.sh
rename to qpid/java/perftests/etc/scripts/fillBroker.sh
diff --git a/java/perftests/etc/scripts/sendAndWaitClient.sh b/qpid/java/perftests/etc/scripts/sendAndWaitClient.sh
similarity index 100%
rename from java/perftests/etc/scripts/sendAndWaitClient.sh
rename to qpid/java/perftests/etc/scripts/sendAndWaitClient.sh
diff --git a/java/perftests/etc/scripts/testWithPreFill.sh b/qpid/java/perftests/etc/scripts/testWithPreFill.sh
similarity index 100%
rename from java/perftests/etc/scripts/testWithPreFill.sh
rename to qpid/java/perftests/etc/scripts/testWithPreFill.sh
diff --git a/java/perftests/generate-scripts b/qpid/java/perftests/generate-scripts
similarity index 100%
rename from java/perftests/generate-scripts
rename to qpid/java/perftests/generate-scripts
diff --git a/java/perftests/jar-with-dependencies.xml b/qpid/java/perftests/jar-with-dependencies.xml
similarity index 100%
rename from java/perftests/jar-with-dependencies.xml
rename to qpid/java/perftests/jar-with-dependencies.xml
diff --git a/java/perftests/scripts.xml b/qpid/java/perftests/scripts.xml
similarity index 100%
rename from java/perftests/scripts.xml
rename to qpid/java/perftests/scripts.xml
diff --git a/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/client/message/TestMessageFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/config/AMQConnectionFactoryInitialiser.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/config/AbstractConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectionFactoryInitialiser.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/Connector.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/config/Connector.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/config/ConnectorConfig.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java b/qpid/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/config/JBossConnectionFactoryInitialiser.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Config.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Listener.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/MessageFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java b/qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingAsyncTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingDurableClient.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingLatencyTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingSendOnlyClient.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongBouncer.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongProducer.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/requestreply/PingPongTestPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java b/qpid/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/test/testcases/MessageThroughputPerf.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/Config.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/topic/Config.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/topic/Config.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/topic/Listener.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/topic/MessageFactory.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/topic/Publisher.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java
rename to qpid/java/perftests/src/main/java/org/apache/qpid/topic/TopicWithSelectorsTransientVolumeTest.java
diff --git a/java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties b/qpid/java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties
similarity index 100%
rename from java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties
rename to qpid/java/perftests/src/main/java/org/apache/qpid/topic/topicselectors.properties
diff --git a/java/release-docs/RELEASE_NOTES.txt b/qpid/java/release-docs/RELEASE_NOTES.txt
similarity index 100%
rename from java/release-docs/RELEASE_NOTES.txt
rename to qpid/java/release-docs/RELEASE_NOTES.txt
diff --git a/java/resources/LICENSE b/qpid/java/resources/LICENSE
similarity index 100%
rename from java/resources/LICENSE
rename to qpid/java/resources/LICENSE
diff --git a/java/resources/NOTICE b/qpid/java/resources/NOTICE
similarity index 100%
rename from java/resources/NOTICE
rename to qpid/java/resources/NOTICE
diff --git a/java/resources/README.txt b/qpid/java/resources/README.txt
similarity index 100%
rename from java/resources/README.txt
rename to qpid/java/resources/README.txt
diff --git a/java/systests/build.xml b/qpid/java/systests/build.xml
similarity index 100%
rename from java/systests/build.xml
rename to qpid/java/systests/build.xml
diff --git a/java/systests/etc/bin/fail.py b/qpid/java/systests/etc/bin/fail.py
similarity index 100%
rename from java/systests/etc/bin/fail.py
rename to qpid/java/systests/etc/bin/fail.py
diff --git a/java/systests/etc/bin/testclients.sh b/qpid/java/systests/etc/bin/testclients.sh
similarity index 100%
rename from java/systests/etc/bin/testclients.sh
rename to qpid/java/systests/etc/bin/testclients.sh
diff --git a/java/systests/etc/config-systests-ServerConfigurationTest-New.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
similarity index 100%
rename from java/systests/etc/config-systests-ServerConfigurationTest-New.xml
rename to qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
diff --git a/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
similarity index 100%
rename from java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
rename to qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
diff --git a/java/systests/etc/config-systests-acl-settings.xml b/qpid/java/systests/etc/config-systests-acl-settings.xml
similarity index 100%
rename from java/systests/etc/config-systests-acl-settings.xml
rename to qpid/java/systests/etc/config-systests-acl-settings.xml
diff --git a/java/systests/etc/config-systests-acl.xml b/qpid/java/systests/etc/config-systests-acl.xml
similarity index 100%
rename from java/systests/etc/config-systests-acl.xml
rename to qpid/java/systests/etc/config-systests-acl.xml
diff --git a/java/systests/etc/config-systests-aclv2-settings.xml b/qpid/java/systests/etc/config-systests-aclv2-settings.xml
similarity index 100%
rename from java/systests/etc/config-systests-aclv2-settings.xml
rename to qpid/java/systests/etc/config-systests-aclv2-settings.xml
diff --git a/java/systests/etc/config-systests-aclv2.xml b/qpid/java/systests/etc/config-systests-aclv2.xml
similarity index 100%
rename from java/systests/etc/config-systests-aclv2.xml
rename to qpid/java/systests/etc/config-systests-aclv2.xml
diff --git a/java/systests/etc/config-systests-derby-settings.xml b/qpid/java/systests/etc/config-systests-derby-settings.xml
similarity index 100%
rename from java/systests/etc/config-systests-derby-settings.xml
rename to qpid/java/systests/etc/config-systests-derby-settings.xml
diff --git a/java/systests/etc/config-systests-derby.xml b/qpid/java/systests/etc/config-systests-derby.xml
similarity index 100%
rename from java/systests/etc/config-systests-derby.xml
rename to qpid/java/systests/etc/config-systests-derby.xml
diff --git a/java/systests/etc/config-systests-firewall-2.xml b/qpid/java/systests/etc/config-systests-firewall-2.xml
similarity index 100%
rename from java/systests/etc/config-systests-firewall-2.xml
rename to qpid/java/systests/etc/config-systests-firewall-2.xml
diff --git a/java/systests/etc/config-systests-firewall-3.xml b/qpid/java/systests/etc/config-systests-firewall-3.xml
similarity index 100%
rename from java/systests/etc/config-systests-firewall-3.xml
rename to qpid/java/systests/etc/config-systests-firewall-3.xml
diff --git a/java/systests/etc/config-systests-firewall-settings.xml b/qpid/java/systests/etc/config-systests-firewall-settings.xml
similarity index 100%
rename from java/systests/etc/config-systests-firewall-settings.xml
rename to qpid/java/systests/etc/config-systests-firewall-settings.xml
diff --git a/java/systests/etc/config-systests-firewall.xml b/qpid/java/systests/etc/config-systests-firewall.xml
similarity index 100%
rename from java/systests/etc/config-systests-firewall.xml
rename to qpid/java/systests/etc/config-systests-firewall.xml
diff --git a/java/systests/etc/config-systests-settings.xml b/qpid/java/systests/etc/config-systests-settings.xml
similarity index 100%
rename from java/systests/etc/config-systests-settings.xml
rename to qpid/java/systests/etc/config-systests-settings.xml
diff --git a/java/systests/etc/config-systests.xml b/qpid/java/systests/etc/config-systests.xml
similarity index 100%
rename from java/systests/etc/config-systests.xml
rename to qpid/java/systests/etc/config-systests.xml
diff --git a/java/systests/etc/global-default.txt b/qpid/java/systests/etc/global-default.txt
similarity index 100%
rename from java/systests/etc/global-default.txt
rename to qpid/java/systests/etc/global-default.txt
diff --git a/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt b/qpid/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt
similarity index 100%
rename from java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt
rename to qpid/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt
diff --git a/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt b/qpid/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt
similarity index 100%
rename from java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt
rename to qpid/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt
diff --git a/java/systests/etc/test-default.txt b/qpid/java/systests/etc/test-default.txt
similarity index 100%
rename from java/systests/etc/test-default.txt
rename to qpid/java/systests/etc/test-default.txt
diff --git a/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt b/qpid/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt
similarity index 100%
rename from java/systests/etc/test-externalacljmx-deleteexchangefailure.txt
rename to qpid/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt
diff --git a/java/systests/etc/test-externalacljmx.txt b/qpid/java/systests/etc/test-externalacljmx.txt
similarity index 100%
rename from java/systests/etc/test-externalacljmx.txt
rename to qpid/java/systests/etc/test-externalacljmx.txt
diff --git a/java/systests/etc/test-logging.txt b/qpid/java/systests/etc/test-logging.txt
similarity index 100%
rename from java/systests/etc/test-logging.txt
rename to qpid/java/systests/etc/test-logging.txt
diff --git a/java/systests/etc/test2-default.txt b/qpid/java/systests/etc/test2-default.txt
similarity index 100%
rename from java/systests/etc/test2-default.txt
rename to qpid/java/systests/etc/test2-default.txt
diff --git a/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml b/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
rename to qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
diff --git a/java/systests/etc/virtualhosts-systests-acl-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-acl-settings.xml
rename to qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-acl.xml b/qpid/java/systests/etc/virtualhosts-systests-acl.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-acl.xml
rename to qpid/java/systests/etc/virtualhosts-systests-acl.xml
diff --git a/java/systests/etc/virtualhosts-systests-aclv2-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-aclv2-settings.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-aclv2-settings.xml
rename to qpid/java/systests/etc/virtualhosts-systests-aclv2-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-aclv2.xml b/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-aclv2.xml
rename to qpid/java/systests/etc/virtualhosts-systests-aclv2.xml
diff --git a/java/systests/etc/virtualhosts-systests-derby-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-derby-settings.xml
rename to qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
diff --git a/java/systests/etc/virtualhosts-systests-derby.xml b/qpid/java/systests/etc/virtualhosts-systests-derby.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-derby.xml
rename to qpid/java/systests/etc/virtualhosts-systests-derby.xml
diff --git a/java/systests/etc/virtualhosts-systests-firewall-2.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-firewall-2.xml
rename to qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
diff --git a/java/systests/etc/virtualhosts-systests-firewall-3.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-firewall-3.xml
rename to qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
diff --git a/java/systests/etc/virtualhosts-systests-firewall.xml b/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests-firewall.xml
rename to qpid/java/systests/etc/virtualhosts-systests-firewall.xml
diff --git a/java/systests/etc/virtualhosts-systests.xml b/qpid/java/systests/etc/virtualhosts-systests.xml
similarity index 100%
rename from java/systests/etc/virtualhosts-systests.xml
rename to qpid/java/systests/etc/virtualhosts-systests.xml
diff --git a/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java b/qpid/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
rename to qpid/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerImmediatePrefetch.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
diff --git a/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageConnectionStatisticsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsConfigurationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsDeliveryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/BrokerStartupTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConnectionLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/QueueLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/TransientQueueLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/persistent/NoLocalAfterRecoveryTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ConflationQueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/DeepQueueConsumeWithSelector.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/store/PersistentStoreTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/util/RunStats.java
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/server/util/TimedRun.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalQueuesTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/systest/GlobalTopicsTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/systest/MergeConfigurationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/systest/SubscriptionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/systest/TopicTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/LVQTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitTimeoutDelayTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AMQPPublisher.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Assertion.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/AssertionBase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailure.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CauseFailureUserPrompt.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Circuit.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEnd.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/CircuitEndBase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/DropInTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkClientBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkTestContext.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalAMQPCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/LocalCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageIdentityVector.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessageMonitor.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/MessagingTestConfigProperties.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/NotApplicableAssertion.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Publisher.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/Receiver.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestCaseVector.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestClientDetails.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/TestUtils.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchFailureException.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchThread.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/ClockSynchronizer.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/LocalClockSynchronizer.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockReference.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/clocksynch/UDPClockSynchronizer.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedCircuitImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedPublisherImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/DistributedReceiverImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedcircuit/TestClientCircuitEnd.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/Coordinator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/DistributedTestDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/InteropTestDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/OptOutTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClient.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/TestClientControlledTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/listeners/XMLTestListener.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalAMQPPublisherImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalPublisherImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalReceiverImpl.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/package.html b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/package.html
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/package.html
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/AMQPFeatureDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/BaseCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/CircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/FailoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/ImmediateMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/MandatoryMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/Acknowledge2ConsumersTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/close/CloseTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Client.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/Service.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ServiceCreator.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/SpecialQueue.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8En
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Jp
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/publish/DirtyTransactedPublishTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/publish/DirtyTransactedPublishTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/publish/DirtyTransactedPublishTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/publish/DirtyTransactedPublishTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutConfigurationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutConfigurationTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutConfigurationTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutConfigurationTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutDisabledTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnection.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnectionHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnectionHelper.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnectionHelper.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidClientConnectionHelper.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtils.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ReflectionUtilsException.java
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/protocol/TestIoSession.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/protocol/TestIoSession.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/test/utils/protocol/TestIoSession.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/test/utils/protocol/TestIoSession.java
diff --git a/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/util/ClasspathScanner.java
diff --git a/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
diff --git a/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
similarity index 100%
rename from java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
rename to qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
diff --git a/java/systests/src/main/java/systests.log4j b/qpid/java/systests/src/main/java/systests.log4j
similarity index 100%
rename from java/systests/src/main/java/systests.log4j
rename to qpid/java/systests/src/main/java/systests.log4j
diff --git a/java/tasks/src/org/apache/qpid/tasks/BaseTask.java b/qpid/java/tasks/src/org/apache/qpid/tasks/BaseTask.java
similarity index 100%
rename from java/tasks/src/org/apache/qpid/tasks/BaseTask.java
rename to qpid/java/tasks/src/org/apache/qpid/tasks/BaseTask.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/Foreach.java b/qpid/java/tasks/src/org/apache/qpid/tasks/Foreach.java
similarity index 100%
rename from java/tasks/src/org/apache/qpid/tasks/Foreach.java
rename to qpid/java/tasks/src/org/apache/qpid/tasks/Foreach.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/Map.java b/qpid/java/tasks/src/org/apache/qpid/tasks/Map.java
similarity index 100%
rename from java/tasks/src/org/apache/qpid/tasks/Map.java
rename to qpid/java/tasks/src/org/apache/qpid/tasks/Map.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java b/qpid/java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java
similarity index 100%
rename from java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java
rename to qpid/java/tasks/src/org/apache/qpid/tasks/PropertyMapper.java
diff --git a/java/tasks/src/org/apache/qpid/tasks/Require.java b/qpid/java/tasks/src/org/apache/qpid/tasks/Require.java
similarity index 100%
rename from java/tasks/src/org/apache/qpid/tasks/Require.java
rename to qpid/java/tasks/src/org/apache/qpid/tasks/Require.java
diff --git a/java/test-profiles/08StandaloneExcludes b/qpid/java/test-profiles/08StandaloneExcludes
similarity index 100%
rename from java/test-profiles/08StandaloneExcludes
rename to qpid/java/test-profiles/08StandaloneExcludes
diff --git a/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
similarity index 100%
rename from java/test-profiles/CPPExcludes
rename to qpid/java/test-profiles/CPPExcludes
diff --git a/java/test-profiles/CPPNoPrefetchExcludes b/qpid/java/test-profiles/CPPNoPrefetchExcludes
similarity index 100%
rename from java/test-profiles/CPPNoPrefetchExcludes
rename to qpid/java/test-profiles/CPPNoPrefetchExcludes
diff --git a/java/test-profiles/CPPPrefetchExcludes b/qpid/java/test-profiles/CPPPrefetchExcludes
similarity index 100%
rename from java/test-profiles/CPPPrefetchExcludes
rename to qpid/java/test-profiles/CPPPrefetchExcludes
diff --git a/java/test-profiles/CPPTransientExcludes b/qpid/java/test-profiles/CPPTransientExcludes
similarity index 100%
rename from java/test-profiles/CPPTransientExcludes
rename to qpid/java/test-profiles/CPPTransientExcludes
diff --git a/java/test-profiles/Excludes b/qpid/java/test-profiles/Excludes
similarity index 100%
rename from java/test-profiles/Excludes
rename to qpid/java/test-profiles/Excludes
diff --git a/java/test-profiles/Java010Excludes b/qpid/java/test-profiles/Java010Excludes
similarity index 100%
rename from java/test-profiles/Java010Excludes
rename to qpid/java/test-profiles/Java010Excludes
diff --git a/java/test-profiles/JavaExcludes b/qpid/java/test-profiles/JavaExcludes
similarity index 100%
rename from java/test-profiles/JavaExcludes
rename to qpid/java/test-profiles/JavaExcludes
diff --git a/java/test-profiles/JavaInVMExcludes b/qpid/java/test-profiles/JavaInVMExcludes
similarity index 100%
rename from java/test-profiles/JavaInVMExcludes
rename to qpid/java/test-profiles/JavaInVMExcludes
diff --git a/java/test-profiles/JavaPersistentExcludes b/qpid/java/test-profiles/JavaPersistentExcludes
similarity index 100%
rename from java/test-profiles/JavaPersistentExcludes
rename to qpid/java/test-profiles/JavaPersistentExcludes
diff --git a/java/test-profiles/JavaStandaloneExcludes b/qpid/java/test-profiles/JavaStandaloneExcludes
similarity index 100%
rename from java/test-profiles/JavaStandaloneExcludes
rename to qpid/java/test-profiles/JavaStandaloneExcludes
diff --git a/java/test-profiles/JavaTransientExcludes b/qpid/java/test-profiles/JavaTransientExcludes
similarity index 100%
rename from java/test-profiles/JavaTransientExcludes
rename to qpid/java/test-profiles/JavaTransientExcludes
diff --git a/java/test-profiles/XAExcludes b/qpid/java/test-profiles/XAExcludes
similarity index 100%
rename from java/test-profiles/XAExcludes
rename to qpid/java/test-profiles/XAExcludes
diff --git a/java/test-profiles/clean-dir b/qpid/java/test-profiles/clean-dir
similarity index 100%
rename from java/test-profiles/clean-dir
rename to qpid/java/test-profiles/clean-dir
diff --git a/java/test-profiles/cpp.async.excludes b/qpid/java/test-profiles/cpp.async.excludes
similarity index 100%
rename from java/test-profiles/cpp.async.excludes
rename to qpid/java/test-profiles/cpp.async.excludes
diff --git a/java/test-profiles/cpp.async.testprofile b/qpid/java/test-profiles/cpp.async.testprofile
similarity index 100%
rename from java/test-profiles/cpp.async.testprofile
rename to qpid/java/test-profiles/cpp.async.testprofile
diff --git a/java/test-profiles/cpp.cluster.testprofile b/qpid/java/test-profiles/cpp.cluster.testprofile
similarity index 100%
rename from java/test-profiles/cpp.cluster.testprofile
rename to qpid/java/test-profiles/cpp.cluster.testprofile
diff --git a/java/test-profiles/cpp.excludes b/qpid/java/test-profiles/cpp.excludes
similarity index 100%
rename from java/test-profiles/cpp.excludes
rename to qpid/java/test-profiles/cpp.excludes
diff --git a/java/test-profiles/cpp.noprefetch.testprofile b/qpid/java/test-profiles/cpp.noprefetch.testprofile
similarity index 100%
rename from java/test-profiles/cpp.noprefetch.testprofile
rename to qpid/java/test-profiles/cpp.noprefetch.testprofile
diff --git a/java/test-profiles/cpp.ssl.excludes b/qpid/java/test-profiles/cpp.ssl.excludes
similarity index 100%
rename from java/test-profiles/cpp.ssl.excludes
rename to qpid/java/test-profiles/cpp.ssl.excludes
diff --git a/java/test-profiles/cpp.ssl.testprofile b/qpid/java/test-profiles/cpp.ssl.testprofile
similarity index 100%
rename from java/test-profiles/cpp.ssl.testprofile
rename to qpid/java/test-profiles/cpp.ssl.testprofile
diff --git a/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile
similarity index 100%
rename from java/test-profiles/cpp.testprofile
rename to qpid/java/test-profiles/cpp.testprofile
diff --git a/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile
similarity index 100%
rename from java/test-profiles/default.testprofile
rename to qpid/java/test-profiles/default.testprofile
diff --git a/java/test-profiles/java-derby.0.10.testprofile b/qpid/java/test-profiles/java-derby.0.10.testprofile
similarity index 100%
rename from java/test-profiles/java-derby.0.10.testprofile
rename to qpid/java/test-profiles/java-derby.0.10.testprofile
diff --git a/java/test-profiles/java-derby.testprofile b/qpid/java/test-profiles/java-derby.testprofile
similarity index 100%
rename from java/test-profiles/java-derby.testprofile
rename to qpid/java/test-profiles/java-derby.testprofile
diff --git a/java/test-profiles/java.0.10.testprofile b/qpid/java/test-profiles/java.0.10.testprofile
similarity index 100%
rename from java/test-profiles/java.0.10.testprofile
rename to qpid/java/test-profiles/java.0.10.testprofile
diff --git a/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile
similarity index 100%
rename from java/test-profiles/java.testprofile
rename to qpid/java/test-profiles/java.testprofile
diff --git a/java/test-profiles/kill-broker b/qpid/java/test-profiles/kill-broker
similarity index 100%
rename from java/test-profiles/kill-broker
rename to qpid/java/test-profiles/kill-broker
diff --git a/java/test-profiles/log4j-test.xml b/qpid/java/test-profiles/log4j-test.xml
similarity index 100%
rename from java/test-profiles/log4j-test.xml
rename to qpid/java/test-profiles/log4j-test.xml
diff --git a/java/test-profiles/start-broker b/qpid/java/test-profiles/start-broker
similarity index 100%
rename from java/test-profiles/start-broker
rename to qpid/java/test-profiles/start-broker
diff --git a/java/test-profiles/test-provider.properties b/qpid/java/test-profiles/test-provider.properties
similarity index 100%
rename from java/test-profiles/test-provider.properties
rename to qpid/java/test-profiles/test-provider.properties
diff --git a/java/test-profiles/test_resources/ssl/CA_db/cert8.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
similarity index 100%
rename from java/test-profiles/test_resources/ssl/CA_db/cert8.db
rename to qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/CA_db/key3.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
similarity index 100%
rename from java/test-profiles/test_resources/ssl/CA_db/key3.db
rename to qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/CA_db/rootca.crt b/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
similarity index 100%
rename from java/test-profiles/test_resources/ssl/CA_db/rootca.crt
rename to qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
diff --git a/java/test-profiles/test_resources/ssl/CA_db/secmod.db b/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
similarity index 100%
rename from java/test-profiles/test_resources/ssl/CA_db/secmod.db
rename to qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/app1.crt b/qpid/java/test-profiles/test_resources/ssl/app1.crt
similarity index 100%
rename from java/test-profiles/test_resources/ssl/app1.crt
rename to qpid/java/test-profiles/test_resources/ssl/app1.crt
diff --git a/java/test-profiles/test_resources/ssl/app1.req b/qpid/java/test-profiles/test_resources/ssl/app1.req
similarity index 100%
rename from java/test-profiles/test_resources/ssl/app1.req
rename to qpid/java/test-profiles/test_resources/ssl/app1.req
diff --git a/java/test-profiles/test_resources/ssl/app2.crt b/qpid/java/test-profiles/test_resources/ssl/app2.crt
similarity index 100%
rename from java/test-profiles/test_resources/ssl/app2.crt
rename to qpid/java/test-profiles/test_resources/ssl/app2.crt
diff --git a/java/test-profiles/test_resources/ssl/app2.req b/qpid/java/test-profiles/test_resources/ssl/app2.req
similarity index 100%
rename from java/test-profiles/test_resources/ssl/app2.req
rename to qpid/java/test-profiles/test_resources/ssl/app2.req
diff --git a/java/test-profiles/test_resources/ssl/certstore.jks b/qpid/java/test-profiles/test_resources/ssl/certstore.jks
similarity index 100%
rename from java/test-profiles/test_resources/ssl/certstore.jks
rename to qpid/java/test-profiles/test_resources/ssl/certstore.jks
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/keystore.jks b/qpid/java/test-profiles/test_resources/ssl/keystore.jks
similarity index 100%
rename from java/test-profiles/test_resources/ssl/keystore.jks
rename to qpid/java/test-profiles/test_resources/ssl/keystore.jks
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/pfile b/qpid/java/test-profiles/test_resources/ssl/pfile
similarity index 100%
rename from java/test-profiles/test_resources/ssl/pfile
rename to qpid/java/test-profiles/test_resources/ssl/pfile
diff --git a/java/test-profiles/test_resources/ssl/server_db/cert8.db b/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
similarity index 100%
rename from java/test-profiles/test_resources/ssl/server_db/cert8.db
rename to qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/server_db/key3.db b/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
similarity index 100%
rename from java/test-profiles/test_resources/ssl/server_db/key3.db
rename to qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/server_db/secmod.db b/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
similarity index 100%
rename from java/test-profiles/test_resources/ssl/server_db/secmod.db
rename to qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
Binary files differ
diff --git a/java/test-profiles/test_resources/ssl/server_db/server.crt b/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
similarity index 100%
rename from java/test-profiles/test_resources/ssl/server_db/server.crt
rename to qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
diff --git a/java/test-profiles/test_resources/ssl/server_db/server.req b/qpid/java/test-profiles/test_resources/ssl/server_db/server.req
similarity index 100%
rename from java/test-profiles/test_resources/ssl/server_db/server.req
rename to qpid/java/test-profiles/test_resources/ssl/server_db/server.req
diff --git a/java/testkit/README.txt b/qpid/java/testkit/README.txt
similarity index 100%
rename from java/testkit/README.txt
rename to qpid/java/testkit/README.txt
diff --git a/java/testkit/bin/run_soak_client.sh b/qpid/java/testkit/bin/run_soak_client.sh
similarity index 100%
rename from java/testkit/bin/run_soak_client.sh
rename to qpid/java/testkit/bin/run_soak_client.sh
diff --git a/java/testkit/bin/soak_report.sh b/qpid/java/testkit/bin/soak_report.sh
similarity index 100%
rename from java/testkit/bin/soak_report.sh
rename to qpid/java/testkit/bin/soak_report.sh
diff --git a/java/testkit/build.xml b/qpid/java/testkit/build.xml
similarity index 100%
rename from java/testkit/build.xml
rename to qpid/java/testkit/build.xml
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java b/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
similarity index 100%
rename from java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
rename to qpid/java/testkit/src/main/java/org/apache/qpid/testkit/soak/ResourceLeakTest.java
diff --git a/java/tools/README.txt b/qpid/java/tools/README.txt
similarity index 100%
rename from java/tools/README.txt
rename to qpid/java/tools/README.txt
diff --git a/java/tools/bin/perf_report.sh b/qpid/java/tools/bin/perf_report.sh
similarity index 100%
rename from java/tools/bin/perf_report.sh
rename to qpid/java/tools/bin/perf_report.sh
diff --git a/java/tools/bin/qpid-bench b/qpid/java/tools/bin/qpid-bench
similarity index 100%
rename from java/tools/bin/qpid-bench
rename to qpid/java/tools/bin/qpid-bench
diff --git a/java/tools/bin/qpid-python-testkit b/qpid/java/tools/bin/qpid-python-testkit
similarity index 100%
rename from java/tools/bin/qpid-python-testkit
rename to qpid/java/tools/bin/qpid-python-testkit
diff --git a/java/tools/bin/run_pub.sh b/qpid/java/tools/bin/run_pub.sh
similarity index 100%
rename from java/tools/bin/run_pub.sh
rename to qpid/java/tools/bin/run_pub.sh
diff --git a/java/tools/bin/run_sub.sh b/qpid/java/tools/bin/run_sub.sh
similarity index 100%
rename from java/tools/bin/run_sub.sh
rename to qpid/java/tools/bin/run_sub.sh
diff --git a/java/tools/bin/set-testkit-env.sh b/qpid/java/tools/bin/set-testkit-env.sh
similarity index 100%
rename from java/tools/bin/set-testkit-env.sh
rename to qpid/java/tools/bin/set-testkit-env.sh
diff --git a/java/tools/bin/setenv.sh b/qpid/java/tools/bin/setenv.sh
similarity index 100%
rename from java/tools/bin/setenv.sh
rename to qpid/java/tools/bin/setenv.sh
diff --git a/java/tools/bin/testkit.py b/qpid/java/tools/bin/testkit.py
similarity index 100%
rename from java/tools/bin/testkit.py
rename to qpid/java/tools/bin/testkit.py
diff --git a/java/tools/build.xml b/qpid/java/tools/build.xml
similarity index 100%
rename from java/tools/build.xml
rename to qpid/java/tools/build.xml
diff --git a/java/tools/etc/test.log4j b/qpid/java/tools/etc/test.log4j
similarity index 100%
rename from java/tools/etc/test.log4j
rename to qpid/java/tools/etc/test.log4j
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Client.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Client.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/testkit/Client.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/testkit/Client.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/testkit/Sender.java
diff --git a/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java b/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/MessageFactory.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfConsumer.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfProducer.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
diff --git a/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
similarity index 100%
rename from java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
rename to qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
diff --git a/java/upload.xml b/qpid/java/upload.xml
similarity index 100%
rename from java/upload.xml
rename to qpid/java/upload.xml
diff --git a/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html
similarity index 100%
rename from packaging/windows/INSTALL_NOTES.html
rename to qpid/packaging/windows/INSTALL_NOTES.html
diff --git a/packaging/windows/LICENSE.rtf b/qpid/packaging/windows/LICENSE.rtf
similarity index 100%
rename from packaging/windows/LICENSE.rtf
rename to qpid/packaging/windows/LICENSE.rtf
Binary files differ
diff --git a/packaging/windows/build_installer.bat b/qpid/packaging/windows/build_installer.bat
similarity index 100%
rename from packaging/windows/build_installer.bat
rename to qpid/packaging/windows/build_installer.bat
diff --git a/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj
similarity index 100%
rename from packaging/windows/installer.proj
rename to qpid/packaging/windows/installer.proj
diff --git a/packaging/windows/qpid-icon.ico b/qpid/packaging/windows/qpid-icon.ico
similarity index 100%
rename from packaging/windows/qpid-icon.ico
rename to qpid/packaging/windows/qpid-icon.ico
Binary files differ
diff --git a/packaging/windows/qpid-install-background.bmp b/qpid/packaging/windows/qpid-install-background.bmp
similarity index 100%
rename from packaging/windows/qpid-install-background.bmp
rename to qpid/packaging/windows/qpid-install-background.bmp
Binary files differ
diff --git a/packaging/windows/qpid-install-banner.bmp b/qpid/packaging/windows/qpid-install-banner.bmp
similarity index 100%
rename from packaging/windows/qpid-install-banner.bmp
rename to qpid/packaging/windows/qpid-install-banner.bmp
Binary files differ
diff --git a/packaging/windows/qpidc.wxs b/qpid/packaging/windows/qpidc.wxs
similarity index 100%
rename from packaging/windows/qpidc.wxs
rename to qpid/packaging/windows/qpidc.wxs
diff --git a/python/LICENSE.txt b/qpid/python/LICENSE.txt
similarity index 100%
rename from python/LICENSE.txt
rename to qpid/python/LICENSE.txt
diff --git a/python/MANIFEST.in b/qpid/python/MANIFEST.in
similarity index 100%
rename from python/MANIFEST.in
rename to qpid/python/MANIFEST.in
diff --git a/python/NOTICE.txt b/qpid/python/NOTICE.txt
similarity index 100%
rename from python/NOTICE.txt
rename to qpid/python/NOTICE.txt
diff --git a/python/README.txt b/qpid/python/README.txt
similarity index 100%
rename from python/README.txt
rename to qpid/python/README.txt
diff --git a/python/RELEASE_NOTES b/qpid/python/RELEASE_NOTES
similarity index 100%
rename from python/RELEASE_NOTES
rename to qpid/python/RELEASE_NOTES
diff --git a/python/doc/test-requirements.txt b/qpid/python/doc/test-requirements.txt
similarity index 100%
rename from python/doc/test-requirements.txt
rename to qpid/python/doc/test-requirements.txt
diff --git a/python/examples/README.txt b/qpid/python/examples/README.txt
similarity index 100%
rename from python/examples/README.txt
rename to qpid/python/examples/README.txt
diff --git a/python/examples/api/drain b/qpid/python/examples/api/drain
similarity index 100%
rename from python/examples/api/drain
rename to qpid/python/examples/api/drain
diff --git a/python/examples/api/hello b/qpid/python/examples/api/hello
similarity index 100%
rename from python/examples/api/hello
rename to qpid/python/examples/api/hello
diff --git a/python/examples/api/hello_xml b/qpid/python/examples/api/hello_xml
similarity index 100%
rename from python/examples/api/hello_xml
rename to qpid/python/examples/api/hello_xml
diff --git a/python/examples/api/server b/qpid/python/examples/api/server
similarity index 100%
rename from python/examples/api/server
rename to qpid/python/examples/api/server
diff --git a/python/examples/api/spout b/qpid/python/examples/api/spout
similarity index 100%
rename from python/examples/api/spout
rename to qpid/python/examples/api/spout
diff --git a/python/examples/reservations/common.py b/qpid/python/examples/reservations/common.py
similarity index 100%
rename from python/examples/reservations/common.py
rename to qpid/python/examples/reservations/common.py
diff --git a/python/examples/reservations/inventory b/qpid/python/examples/reservations/inventory
similarity index 100%
rename from python/examples/reservations/inventory
rename to qpid/python/examples/reservations/inventory
diff --git a/python/examples/reservations/machine-agent b/qpid/python/examples/reservations/machine-agent
similarity index 100%
rename from python/examples/reservations/machine-agent
rename to qpid/python/examples/reservations/machine-agent
diff --git a/python/examples/reservations/reserve b/qpid/python/examples/reservations/reserve
similarity index 100%
rename from python/examples/reservations/reserve
rename to qpid/python/examples/reservations/reserve
diff --git a/python/mllib/__init__.py b/qpid/python/mllib/__init__.py
similarity index 100%
rename from python/mllib/__init__.py
rename to qpid/python/mllib/__init__.py
diff --git a/python/mllib/dom.py b/qpid/python/mllib/dom.py
similarity index 100%
rename from python/mllib/dom.py
rename to qpid/python/mllib/dom.py
diff --git a/python/mllib/parsers.py b/qpid/python/mllib/parsers.py
similarity index 100%
rename from python/mllib/parsers.py
rename to qpid/python/mllib/parsers.py
diff --git a/python/mllib/transforms.py b/qpid/python/mllib/transforms.py
similarity index 100%
rename from python/mllib/transforms.py
rename to qpid/python/mllib/transforms.py
diff --git a/python/qpid-python-test b/qpid/python/qpid-python-test
similarity index 100%
rename from python/qpid-python-test
rename to qpid/python/qpid-python-test
diff --git a/python/qpid/__init__.py b/qpid/python/qpid/__init__.py
similarity index 100%
rename from python/qpid/__init__.py
rename to qpid/python/qpid/__init__.py
diff --git a/python/qpid/client.py b/qpid/python/qpid/client.py
similarity index 100%
rename from python/qpid/client.py
rename to qpid/python/qpid/client.py
diff --git a/python/qpid/codec.py b/qpid/python/qpid/codec.py
similarity index 100%
rename from python/qpid/codec.py
rename to qpid/python/qpid/codec.py
diff --git a/python/qpid/codec010.py b/qpid/python/qpid/codec010.py
similarity index 100%
rename from python/qpid/codec010.py
rename to qpid/python/qpid/codec010.py
diff --git a/python/qpid/compat.py b/qpid/python/qpid/compat.py
similarity index 100%
rename from python/qpid/compat.py
rename to qpid/python/qpid/compat.py
diff --git a/python/qpid/concurrency.py b/qpid/python/qpid/concurrency.py
similarity index 100%
rename from python/qpid/concurrency.py
rename to qpid/python/qpid/concurrency.py
diff --git a/python/qpid/connection.py b/qpid/python/qpid/connection.py
similarity index 100%
rename from python/qpid/connection.py
rename to qpid/python/qpid/connection.py
diff --git a/python/qpid/connection08.py b/qpid/python/qpid/connection08.py
similarity index 100%
rename from python/qpid/connection08.py
rename to qpid/python/qpid/connection08.py
diff --git a/python/qpid/content.py b/qpid/python/qpid/content.py
similarity index 100%
rename from python/qpid/content.py
rename to qpid/python/qpid/content.py
diff --git a/python/qpid/datatypes.py b/qpid/python/qpid/datatypes.py
similarity index 100%
rename from python/qpid/datatypes.py
rename to qpid/python/qpid/datatypes.py
diff --git a/python/qpid/debug.py b/qpid/python/qpid/debug.py
similarity index 100%
rename from python/qpid/debug.py
rename to qpid/python/qpid/debug.py
diff --git a/python/qpid/delegate.py b/qpid/python/qpid/delegate.py
similarity index 100%
rename from python/qpid/delegate.py
rename to qpid/python/qpid/delegate.py
diff --git a/python/qpid/delegates.py b/qpid/python/qpid/delegates.py
similarity index 100%
rename from python/qpid/delegates.py
rename to qpid/python/qpid/delegates.py
diff --git a/python/qpid/disp.py b/qpid/python/qpid/disp.py
similarity index 100%
rename from python/qpid/disp.py
rename to qpid/python/qpid/disp.py
diff --git a/python/qpid/exceptions.py b/qpid/python/qpid/exceptions.py
similarity index 100%
rename from python/qpid/exceptions.py
rename to qpid/python/qpid/exceptions.py
diff --git a/python/qpid/framer.py b/qpid/python/qpid/framer.py
similarity index 100%
rename from python/qpid/framer.py
rename to qpid/python/qpid/framer.py
diff --git a/python/qpid/framing.py b/qpid/python/qpid/framing.py
similarity index 100%
rename from python/qpid/framing.py
rename to qpid/python/qpid/framing.py
diff --git a/python/qpid/generator.py b/qpid/python/qpid/generator.py
similarity index 100%
rename from python/qpid/generator.py
rename to qpid/python/qpid/generator.py
diff --git a/python/qpid/harness.py b/qpid/python/qpid/harness.py
similarity index 100%
rename from python/qpid/harness.py
rename to qpid/python/qpid/harness.py
diff --git a/python/qpid/lexer.py b/qpid/python/qpid/lexer.py
similarity index 100%
rename from python/qpid/lexer.py
rename to qpid/python/qpid/lexer.py
diff --git a/python/qpid/log.py b/qpid/python/qpid/log.py
similarity index 100%
rename from python/qpid/log.py
rename to qpid/python/qpid/log.py
diff --git a/python/qpid/management.py b/qpid/python/qpid/management.py
similarity index 100%
rename from python/qpid/management.py
rename to qpid/python/qpid/management.py
diff --git a/python/qpid/managementdata.py b/qpid/python/qpid/managementdata.py
similarity index 100%
rename from python/qpid/managementdata.py
rename to qpid/python/qpid/managementdata.py
diff --git a/python/qpid/message.py b/qpid/python/qpid/message.py
similarity index 100%
rename from python/qpid/message.py
rename to qpid/python/qpid/message.py
diff --git a/python/qpid/messaging/__init__.py b/qpid/python/qpid/messaging/__init__.py
similarity index 100%
rename from python/qpid/messaging/__init__.py
rename to qpid/python/qpid/messaging/__init__.py
diff --git a/python/qpid/messaging/address.py b/qpid/python/qpid/messaging/address.py
similarity index 100%
rename from python/qpid/messaging/address.py
rename to qpid/python/qpid/messaging/address.py
diff --git a/python/qpid/messaging/constants.py b/qpid/python/qpid/messaging/constants.py
similarity index 100%
rename from python/qpid/messaging/constants.py
rename to qpid/python/qpid/messaging/constants.py
diff --git a/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
similarity index 99%
rename from python/qpid/messaging/driver.py
rename to qpid/python/qpid/messaging/driver.py
index 78af282..7c21388 100644
--- a/python/qpid/messaging/driver.py
+++ b/qpid/python/qpid/messaging/driver.py
@@ -828,8 +828,9 @@
     self._closing = True
 
   def attach(self, ssn):
+    if ssn.closed: return
     sst = self._attachments.get(ssn)
-    if sst is None and not ssn.closed:
+    if sst is None:
       for i in xrange(0, self.channel_max):
         if not self._sessions.has_key(i):
           ch = i
diff --git a/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
similarity index 100%
rename from python/qpid/messaging/endpoints.py
rename to qpid/python/qpid/messaging/endpoints.py
diff --git a/python/qpid/messaging/exceptions.py b/qpid/python/qpid/messaging/exceptions.py
similarity index 100%
rename from python/qpid/messaging/exceptions.py
rename to qpid/python/qpid/messaging/exceptions.py
diff --git a/python/qpid/messaging/message.py b/qpid/python/qpid/messaging/message.py
similarity index 100%
rename from python/qpid/messaging/message.py
rename to qpid/python/qpid/messaging/message.py
diff --git a/python/qpid/messaging/transports.py b/qpid/python/qpid/messaging/transports.py
similarity index 100%
rename from python/qpid/messaging/transports.py
rename to qpid/python/qpid/messaging/transports.py
diff --git a/python/qpid/messaging/util.py b/qpid/python/qpid/messaging/util.py
similarity index 100%
rename from python/qpid/messaging/util.py
rename to qpid/python/qpid/messaging/util.py
diff --git a/python/qpid/mimetype.py b/qpid/python/qpid/mimetype.py
similarity index 100%
rename from python/qpid/mimetype.py
rename to qpid/python/qpid/mimetype.py
diff --git a/python/qpid/ops.py b/qpid/python/qpid/ops.py
similarity index 100%
rename from python/qpid/ops.py
rename to qpid/python/qpid/ops.py
diff --git a/python/qpid/packer.py b/qpid/python/qpid/packer.py
similarity index 100%
rename from python/qpid/packer.py
rename to qpid/python/qpid/packer.py
diff --git a/python/qpid/parser.py b/qpid/python/qpid/parser.py
similarity index 100%
rename from python/qpid/parser.py
rename to qpid/python/qpid/parser.py
diff --git a/python/qpid/peer.py b/qpid/python/qpid/peer.py
similarity index 100%
rename from python/qpid/peer.py
rename to qpid/python/qpid/peer.py
diff --git a/python/qpid/queue.py b/qpid/python/qpid/queue.py
similarity index 100%
rename from python/qpid/queue.py
rename to qpid/python/qpid/queue.py
diff --git a/python/qpid/reference.py b/qpid/python/qpid/reference.py
similarity index 100%
rename from python/qpid/reference.py
rename to qpid/python/qpid/reference.py
diff --git a/python/qpid/sasl.py b/qpid/python/qpid/sasl.py
similarity index 100%
rename from python/qpid/sasl.py
rename to qpid/python/qpid/sasl.py
diff --git a/python/qpid/selector.py b/qpid/python/qpid/selector.py
similarity index 100%
rename from python/qpid/selector.py
rename to qpid/python/qpid/selector.py
diff --git a/python/qpid/session.py b/qpid/python/qpid/session.py
similarity index 100%
rename from python/qpid/session.py
rename to qpid/python/qpid/session.py
diff --git a/python/qpid/spec08.py b/qpid/python/qpid/spec08.py
similarity index 100%
rename from python/qpid/spec08.py
rename to qpid/python/qpid/spec08.py
diff --git a/python/qpid/specs/amqp-0-10-qpid-errata.xml b/qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml
similarity index 100%
rename from python/qpid/specs/amqp-0-10-qpid-errata.xml
rename to qpid/python/qpid/specs/amqp-0-10-qpid-errata.xml
diff --git a/python/qpid/specs/amqp-0-10.dtd b/qpid/python/qpid/specs/amqp-0-10.dtd
similarity index 100%
rename from python/qpid/specs/amqp-0-10.dtd
rename to qpid/python/qpid/specs/amqp-0-10.dtd
diff --git a/python/qpid/specs/amqp-0-8.xml b/qpid/python/qpid/specs/amqp-0-8.xml
similarity index 100%
rename from python/qpid/specs/amqp-0-8.xml
rename to qpid/python/qpid/specs/amqp-0-8.xml
diff --git a/python/qpid/specs/amqp-0-9.xml b/qpid/python/qpid/specs/amqp-0-9.xml
similarity index 100%
rename from python/qpid/specs/amqp-0-9.xml
rename to qpid/python/qpid/specs/amqp-0-9.xml
diff --git a/python/qpid/specs_config.py b/qpid/python/qpid/specs_config.py
similarity index 100%
rename from python/qpid/specs_config.py
rename to qpid/python/qpid/specs_config.py
diff --git a/python/qpid/testlib.py b/qpid/python/qpid/testlib.py
similarity index 100%
rename from python/qpid/testlib.py
rename to qpid/python/qpid/testlib.py
diff --git a/python/qpid/tests/__init__.py b/qpid/python/qpid/tests/__init__.py
similarity index 100%
rename from python/qpid/tests/__init__.py
rename to qpid/python/qpid/tests/__init__.py
diff --git a/python/qpid/tests/codec.py b/qpid/python/qpid/tests/codec.py
similarity index 100%
rename from python/qpid/tests/codec.py
rename to qpid/python/qpid/tests/codec.py
diff --git a/python/qpid/tests/codec010.py b/qpid/python/qpid/tests/codec010.py
similarity index 100%
rename from python/qpid/tests/codec010.py
rename to qpid/python/qpid/tests/codec010.py
diff --git a/python/qpid/tests/connection.py b/qpid/python/qpid/tests/connection.py
similarity index 100%
rename from python/qpid/tests/connection.py
rename to qpid/python/qpid/tests/connection.py
diff --git a/python/qpid/tests/datatypes.py b/qpid/python/qpid/tests/datatypes.py
similarity index 100%
rename from python/qpid/tests/datatypes.py
rename to qpid/python/qpid/tests/datatypes.py
diff --git a/python/qpid/tests/framing.py b/qpid/python/qpid/tests/framing.py
similarity index 100%
rename from python/qpid/tests/framing.py
rename to qpid/python/qpid/tests/framing.py
diff --git a/python/qpid/tests/messaging/__init__.py b/qpid/python/qpid/tests/messaging/__init__.py
similarity index 100%
rename from python/qpid/tests/messaging/__init__.py
rename to qpid/python/qpid/tests/messaging/__init__.py
diff --git a/python/qpid/tests/messaging/address.py b/qpid/python/qpid/tests/messaging/address.py
similarity index 100%
rename from python/qpid/tests/messaging/address.py
rename to qpid/python/qpid/tests/messaging/address.py
diff --git a/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py
similarity index 100%
rename from python/qpid/tests/messaging/endpoints.py
rename to qpid/python/qpid/tests/messaging/endpoints.py
diff --git a/python/qpid/tests/messaging/message.py b/qpid/python/qpid/tests/messaging/message.py
similarity index 100%
rename from python/qpid/tests/messaging/message.py
rename to qpid/python/qpid/tests/messaging/message.py
diff --git a/python/qpid/tests/mimetype.py b/qpid/python/qpid/tests/mimetype.py
similarity index 100%
rename from python/qpid/tests/mimetype.py
rename to qpid/python/qpid/tests/mimetype.py
diff --git a/python/qpid/tests/parser.py b/qpid/python/qpid/tests/parser.py
similarity index 100%
rename from python/qpid/tests/parser.py
rename to qpid/python/qpid/tests/parser.py
diff --git a/python/qpid/tests/queue.py b/qpid/python/qpid/tests/queue.py
similarity index 100%
rename from python/qpid/tests/queue.py
rename to qpid/python/qpid/tests/queue.py
diff --git a/python/qpid/tests/spec010.py b/qpid/python/qpid/tests/spec010.py
similarity index 100%
rename from python/qpid/tests/spec010.py
rename to qpid/python/qpid/tests/spec010.py
diff --git a/python/qpid/util.py b/qpid/python/qpid/util.py
similarity index 100%
rename from python/qpid/util.py
rename to qpid/python/qpid/util.py
diff --git a/python/qpid/validator.py b/qpid/python/qpid/validator.py
similarity index 100%
rename from python/qpid/validator.py
rename to qpid/python/qpid/validator.py
diff --git a/python/setup.py b/qpid/python/setup.py
similarity index 100%
rename from python/setup.py
rename to qpid/python/setup.py
diff --git a/python/todo.txt b/qpid/python/todo.txt
similarity index 100%
rename from python/todo.txt
rename to qpid/python/todo.txt
diff --git a/review/LICENSE b/qpid/review/LICENSE
similarity index 100%
rename from review/LICENSE
rename to qpid/review/LICENSE
diff --git a/review/NOTICE b/qpid/review/NOTICE
similarity index 100%
rename from review/NOTICE
rename to qpid/review/NOTICE
diff --git a/review/agenda.py b/qpid/review/agenda.py
similarity index 100%
rename from review/agenda.py
rename to qpid/review/agenda.py
diff --git a/review/changeLogToWiki.py b/qpid/review/changeLogToWiki.py
similarity index 100%
rename from review/changeLogToWiki.py
rename to qpid/review/changeLogToWiki.py
diff --git a/review/jiraRSS2wiki.xsl b/qpid/review/jiraRSS2wiki.xsl
similarity index 100%
rename from review/jiraRSS2wiki.xsl
rename to qpid/review/jiraRSS2wiki.xsl
diff --git a/review/svnlog2wiki.xsl b/qpid/review/svnlog2wiki.xsl
similarity index 100%
rename from review/svnlog2wiki.xsl
rename to qpid/review/svnlog2wiki.xsl
diff --git a/ruby/LICENSE.txt b/qpid/ruby/LICENSE.txt
similarity index 100%
rename from ruby/LICENSE.txt
rename to qpid/ruby/LICENSE.txt
diff --git a/ruby/Makefile b/qpid/ruby/Makefile
similarity index 100%
rename from ruby/Makefile
rename to qpid/ruby/Makefile
diff --git a/ruby/NOTICE.txt b/qpid/ruby/NOTICE.txt
similarity index 100%
rename from ruby/NOTICE.txt
rename to qpid/ruby/NOTICE.txt
diff --git a/ruby/README.txt b/qpid/ruby/README.txt
similarity index 100%
rename from ruby/README.txt
rename to qpid/ruby/README.txt
diff --git a/ruby/RELEASE_NOTES b/qpid/ruby/RELEASE_NOTES
similarity index 100%
rename from ruby/RELEASE_NOTES
rename to qpid/ruby/RELEASE_NOTES
diff --git a/ruby/Rakefile b/qpid/ruby/Rakefile
similarity index 100%
rename from ruby/Rakefile
rename to qpid/ruby/Rakefile
diff --git a/ruby/examples/hello-world.rb b/qpid/ruby/examples/hello-world.rb
similarity index 100%
rename from ruby/examples/hello-world.rb
rename to qpid/ruby/examples/hello-world.rb
diff --git a/ruby/examples/qmf-libvirt.rb b/qpid/ruby/examples/qmf-libvirt.rb
similarity index 100%
rename from ruby/examples/qmf-libvirt.rb
rename to qpid/ruby/examples/qmf-libvirt.rb
diff --git a/ruby/ext/sasl/extconf.rb b/qpid/ruby/ext/sasl/extconf.rb
similarity index 100%
rename from ruby/ext/sasl/extconf.rb
rename to qpid/ruby/ext/sasl/extconf.rb
diff --git a/ruby/ext/sasl/sasl.c b/qpid/ruby/ext/sasl/sasl.c
similarity index 100%
rename from ruby/ext/sasl/sasl.c
rename to qpid/ruby/ext/sasl/sasl.c
diff --git a/ruby/lib/qpid.rb b/qpid/ruby/lib/qpid.rb
similarity index 100%
rename from ruby/lib/qpid.rb
rename to qpid/ruby/lib/qpid.rb
diff --git a/ruby/lib/qpid/assembler.rb b/qpid/ruby/lib/qpid/assembler.rb
similarity index 100%
rename from ruby/lib/qpid/assembler.rb
rename to qpid/ruby/lib/qpid/assembler.rb
diff --git a/ruby/lib/qpid/client.rb b/qpid/ruby/lib/qpid/client.rb
similarity index 100%
rename from ruby/lib/qpid/client.rb
rename to qpid/ruby/lib/qpid/client.rb
diff --git a/ruby/lib/qpid/codec.rb b/qpid/ruby/lib/qpid/codec.rb
similarity index 100%
rename from ruby/lib/qpid/codec.rb
rename to qpid/ruby/lib/qpid/codec.rb
diff --git a/ruby/lib/qpid/codec08.rb b/qpid/ruby/lib/qpid/codec08.rb
similarity index 100%
rename from ruby/lib/qpid/codec08.rb
rename to qpid/ruby/lib/qpid/codec08.rb
diff --git a/ruby/lib/qpid/config.rb b/qpid/ruby/lib/qpid/config.rb
similarity index 100%
rename from ruby/lib/qpid/config.rb
rename to qpid/ruby/lib/qpid/config.rb
diff --git a/ruby/lib/qpid/connection.rb b/qpid/ruby/lib/qpid/connection.rb
similarity index 100%
rename from ruby/lib/qpid/connection.rb
rename to qpid/ruby/lib/qpid/connection.rb
diff --git a/ruby/lib/qpid/connection08.rb b/qpid/ruby/lib/qpid/connection08.rb
similarity index 100%
rename from ruby/lib/qpid/connection08.rb
rename to qpid/ruby/lib/qpid/connection08.rb
diff --git a/ruby/lib/qpid/datatypes.rb b/qpid/ruby/lib/qpid/datatypes.rb
similarity index 100%
rename from ruby/lib/qpid/datatypes.rb
rename to qpid/ruby/lib/qpid/datatypes.rb
diff --git a/ruby/lib/qpid/delegates.rb b/qpid/ruby/lib/qpid/delegates.rb
similarity index 100%
rename from ruby/lib/qpid/delegates.rb
rename to qpid/ruby/lib/qpid/delegates.rb
diff --git a/ruby/lib/qpid/fields.rb b/qpid/ruby/lib/qpid/fields.rb
similarity index 100%
rename from ruby/lib/qpid/fields.rb
rename to qpid/ruby/lib/qpid/fields.rb
diff --git a/ruby/lib/qpid/framer.rb b/qpid/ruby/lib/qpid/framer.rb
similarity index 100%
rename from ruby/lib/qpid/framer.rb
rename to qpid/ruby/lib/qpid/framer.rb
diff --git a/ruby/lib/qpid/invoker.rb b/qpid/ruby/lib/qpid/invoker.rb
similarity index 100%
rename from ruby/lib/qpid/invoker.rb
rename to qpid/ruby/lib/qpid/invoker.rb
diff --git a/ruby/lib/qpid/packer.rb b/qpid/ruby/lib/qpid/packer.rb
similarity index 100%
rename from ruby/lib/qpid/packer.rb
rename to qpid/ruby/lib/qpid/packer.rb
diff --git a/ruby/lib/qpid/peer.rb b/qpid/ruby/lib/qpid/peer.rb
similarity index 100%
rename from ruby/lib/qpid/peer.rb
rename to qpid/ruby/lib/qpid/peer.rb
diff --git a/ruby/lib/qpid/qmf.rb b/qpid/ruby/lib/qpid/qmf.rb
similarity index 100%
rename from ruby/lib/qpid/qmf.rb
rename to qpid/ruby/lib/qpid/qmf.rb
diff --git a/ruby/lib/qpid/queue.rb b/qpid/ruby/lib/qpid/queue.rb
similarity index 100%
rename from ruby/lib/qpid/queue.rb
rename to qpid/ruby/lib/qpid/queue.rb
diff --git a/ruby/lib/qpid/session.rb b/qpid/ruby/lib/qpid/session.rb
similarity index 100%
rename from ruby/lib/qpid/session.rb
rename to qpid/ruby/lib/qpid/session.rb
diff --git a/ruby/lib/qpid/spec.rb b/qpid/ruby/lib/qpid/spec.rb
similarity index 100%
rename from ruby/lib/qpid/spec.rb
rename to qpid/ruby/lib/qpid/spec.rb
diff --git a/ruby/lib/qpid/spec010.rb b/qpid/ruby/lib/qpid/spec010.rb
similarity index 100%
rename from ruby/lib/qpid/spec010.rb
rename to qpid/ruby/lib/qpid/spec010.rb
diff --git a/ruby/lib/qpid/spec08.rb b/qpid/ruby/lib/qpid/spec08.rb
similarity index 100%
rename from ruby/lib/qpid/spec08.rb
rename to qpid/ruby/lib/qpid/spec08.rb
diff --git a/ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml b/qpid/ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml
similarity index 100%
rename from ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml
rename to qpid/ruby/lib/qpid/specs/amqp.0-10-qpid-errata.xml
diff --git a/ruby/lib/qpid/specs/amqp.0-10.dtd b/qpid/ruby/lib/qpid/specs/amqp.0-10.dtd
similarity index 100%
rename from ruby/lib/qpid/specs/amqp.0-10.dtd
rename to qpid/ruby/lib/qpid/specs/amqp.0-10.dtd
diff --git a/ruby/lib/qpid/test.rb b/qpid/ruby/lib/qpid/test.rb
similarity index 100%
rename from ruby/lib/qpid/test.rb
rename to qpid/ruby/lib/qpid/test.rb
diff --git a/ruby/lib/qpid/traverse.rb b/qpid/ruby/lib/qpid/traverse.rb
similarity index 100%
rename from ruby/lib/qpid/traverse.rb
rename to qpid/ruby/lib/qpid/traverse.rb
diff --git a/ruby/lib/qpid/util.rb b/qpid/ruby/lib/qpid/util.rb
similarity index 100%
rename from ruby/lib/qpid/util.rb
rename to qpid/ruby/lib/qpid/util.rb
diff --git a/ruby/tests/assembler.rb b/qpid/ruby/tests/assembler.rb
similarity index 100%
rename from ruby/tests/assembler.rb
rename to qpid/ruby/tests/assembler.rb
diff --git a/ruby/tests/codec010.rb b/qpid/ruby/tests/codec010.rb
similarity index 100%
rename from ruby/tests/codec010.rb
rename to qpid/ruby/tests/codec010.rb
diff --git a/ruby/tests/connection.rb b/qpid/ruby/tests/connection.rb
similarity index 100%
rename from ruby/tests/connection.rb
rename to qpid/ruby/tests/connection.rb
diff --git a/ruby/tests/datatypes.rb b/qpid/ruby/tests/datatypes.rb
similarity index 100%
rename from ruby/tests/datatypes.rb
rename to qpid/ruby/tests/datatypes.rb
diff --git a/ruby/tests/framer.rb b/qpid/ruby/tests/framer.rb
similarity index 100%
rename from ruby/tests/framer.rb
rename to qpid/ruby/tests/framer.rb
diff --git a/ruby/tests/qmf.rb b/qpid/ruby/tests/qmf.rb
similarity index 100%
rename from ruby/tests/qmf.rb
rename to qpid/ruby/tests/qmf.rb
diff --git a/ruby/tests/queue.rb b/qpid/ruby/tests/queue.rb
similarity index 100%
rename from ruby/tests/queue.rb
rename to qpid/ruby/tests/queue.rb
diff --git a/ruby/tests/spec010.rb b/qpid/ruby/tests/spec010.rb
similarity index 100%
rename from ruby/tests/spec010.rb
rename to qpid/ruby/tests/spec010.rb
diff --git a/ruby/tests/util.rb b/qpid/ruby/tests/util.rb
similarity index 100%
rename from ruby/tests/util.rb
rename to qpid/ruby/tests/util.rb
diff --git a/ruby/tests_0-8/basic.rb b/qpid/ruby/tests_0-8/basic.rb
similarity index 100%
rename from ruby/tests_0-8/basic.rb
rename to qpid/ruby/tests_0-8/basic.rb
diff --git a/ruby/tests_0-8/channel.rb b/qpid/ruby/tests_0-8/channel.rb
similarity index 100%
rename from ruby/tests_0-8/channel.rb
rename to qpid/ruby/tests_0-8/channel.rb
diff --git a/sandbox/models/fedsim/__init__.py b/qpid/sandbox/models/fedsim/__init__.py
similarity index 100%
rename from sandbox/models/fedsim/__init__.py
rename to qpid/sandbox/models/fedsim/__init__.py
diff --git a/sandbox/models/fedsim/fedsim.py b/qpid/sandbox/models/fedsim/fedsim.py
similarity index 100%
rename from sandbox/models/fedsim/fedsim.py
rename to qpid/sandbox/models/fedsim/fedsim.py
diff --git a/sandbox/models/fedsim/testBig.py b/qpid/sandbox/models/fedsim/testBig.py
similarity index 100%
rename from sandbox/models/fedsim/testBig.py
rename to qpid/sandbox/models/fedsim/testBig.py
diff --git a/sandbox/models/fedsim/testRing.py b/qpid/sandbox/models/fedsim/testRing.py
similarity index 100%
rename from sandbox/models/fedsim/testRing.py
rename to qpid/sandbox/models/fedsim/testRing.py
diff --git a/sandbox/models/fedsim/testStar.py b/qpid/sandbox/models/fedsim/testStar.py
similarity index 100%
rename from sandbox/models/fedsim/testStar.py
rename to qpid/sandbox/models/fedsim/testStar.py
diff --git a/sandbox/models/fedsim/testStarAdd.py b/qpid/sandbox/models/fedsim/testStarAdd.py
similarity index 100%
rename from sandbox/models/fedsim/testStarAdd.py
rename to qpid/sandbox/models/fedsim/testStarAdd.py
diff --git a/specs/LICENSE b/qpid/specs/LICENSE
similarity index 100%
rename from specs/LICENSE
rename to qpid/specs/LICENSE
diff --git a/specs/NOTICE b/qpid/specs/NOTICE
similarity index 100%
rename from specs/NOTICE
rename to qpid/specs/NOTICE
diff --git a/specs/amqp-dtx-preview.0-9.xml b/qpid/specs/amqp-dtx-preview.0-9.xml
similarity index 100%
rename from specs/amqp-dtx-preview.0-9.xml
rename to qpid/specs/amqp-dtx-preview.0-9.xml
diff --git a/specs/amqp-errata.0-9.xml b/qpid/specs/amqp-errata.0-9.xml
similarity index 100%
rename from specs/amqp-errata.0-9.xml
rename to qpid/specs/amqp-errata.0-9.xml
diff --git a/specs/amqp-nogen.0-9.xml b/qpid/specs/amqp-nogen.0-9.xml
similarity index 100%
rename from specs/amqp-nogen.0-9.xml
rename to qpid/specs/amqp-nogen.0-9.xml
diff --git a/specs/amqp.0-10-preview.xml b/qpid/specs/amqp.0-10-preview.xml
similarity index 100%
rename from specs/amqp.0-10-preview.xml
rename to qpid/specs/amqp.0-10-preview.xml
diff --git a/specs/amqp.0-10-qpid-errata.xml b/qpid/specs/amqp.0-10-qpid-errata.xml
similarity index 100%
rename from specs/amqp.0-10-qpid-errata.xml
rename to qpid/specs/amqp.0-10-qpid-errata.xml
diff --git a/ruby/lib/qpid/specs/amqp.0-10.dtd b/qpid/specs/amqp.0-10.dtd
similarity index 100%
copy from ruby/lib/qpid/specs/amqp.0-10.dtd
copy to qpid/specs/amqp.0-10.dtd
diff --git a/specs/amqp.0-10.xml b/qpid/specs/amqp.0-10.xml
similarity index 100%
rename from specs/amqp.0-10.xml
rename to qpid/specs/amqp.0-10.xml
diff --git a/specs/amqp.0-8.xml b/qpid/specs/amqp.0-8.xml
similarity index 100%
rename from specs/amqp.0-8.xml
rename to qpid/specs/amqp.0-8.xml
diff --git a/specs/amqp.0-9.xml b/qpid/specs/amqp.0-9.xml
similarity index 100%
rename from specs/amqp.0-9.xml
rename to qpid/specs/amqp.0-9.xml
diff --git a/specs/amqp0-9-1.stripped.xml b/qpid/specs/amqp0-9-1.stripped.xml
similarity index 100%
rename from specs/amqp0-9-1.stripped.xml
rename to qpid/specs/amqp0-9-1.stripped.xml
diff --git a/specs/cluster.0-8.xml b/qpid/specs/cluster.0-8.xml
similarity index 100%
rename from specs/cluster.0-8.xml
rename to qpid/specs/cluster.0-8.xml
diff --git a/specs/management-schema.xml b/qpid/specs/management-schema.xml
similarity index 100%
rename from specs/management-schema.xml
rename to qpid/specs/management-schema.xml
diff --git a/tests/LICENSE.txt b/qpid/tests/LICENSE.txt
similarity index 100%
rename from tests/LICENSE.txt
rename to qpid/tests/LICENSE.txt
diff --git a/tests/NOTICE.txt b/qpid/tests/NOTICE.txt
similarity index 100%
rename from tests/NOTICE.txt
rename to qpid/tests/NOTICE.txt
diff --git a/tests/setup.py b/qpid/tests/setup.py
similarity index 100%
rename from tests/setup.py
rename to qpid/tests/setup.py
diff --git a/tests/src/py/qpid_tests/__init__.py b/qpid/tests/src/py/qpid_tests/__init__.py
similarity index 100%
rename from tests/src/py/qpid_tests/__init__.py
rename to qpid/tests/src/py/qpid_tests/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/__init__.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/broker.py b/qpid/tests/src/py/qpid_tests/broker_0_10/broker.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/broker.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/broker.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/dtx.py b/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/dtx.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/example.py b/qpid/tests/src/py/qpid_tests/broker_0_10/example.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/example.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/example.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/exchange.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/extensions.py b/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/extensions.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/lvq.py b/qpid/tests/src/py/qpid_tests/broker_0_10/lvq.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/lvq.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/lvq.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/management.py b/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/management.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/management.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/message.py b/qpid/tests/src/py/qpid_tests/broker_0_10/message.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/message.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/message.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/persistence.py b/qpid/tests/src/py/qpid_tests/broker_0_10/persistence.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/persistence.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/persistence.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/priority.py b/qpid/tests/src/py/qpid_tests/broker_0_10/priority.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/priority.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/priority.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/query.py b/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/query.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/query.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/queue.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/threshold.py b/qpid/tests/src/py/qpid_tests/broker_0_10/threshold.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/threshold.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/threshold.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/tx.py b/qpid/tests/src/py/qpid_tests/broker_0_10/tx.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_10/tx.py
rename to qpid/tests/src/py/qpid_tests/broker_0_10/tx.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_8/__init__.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/__init__.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/basic.py b/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/basic.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/basic.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/broker.py b/qpid/tests/src/py/qpid_tests/broker_0_8/broker.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/broker.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/broker.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/example.py b/qpid/tests/src/py/qpid_tests/broker_0_8/example.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/example.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/example.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_8/exchange.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/exchange.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_8/queue.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/queue.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/queue.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/testlib.py b/qpid/tests/src/py/qpid_tests/broker_0_8/testlib.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/testlib.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/testlib.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/tx.py b/qpid/tests/src/py/qpid_tests/broker_0_8/tx.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_8/tx.py
rename to qpid/tests/src/py/qpid_tests/broker_0_8/tx.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_9/__init__.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_9/__init__.py
rename to qpid/tests/src/py/qpid_tests/broker_0_9/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/query.py b/qpid/tests/src/py/qpid_tests/broker_0_9/query.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_9/query.py
rename to qpid/tests/src/py/qpid_tests/broker_0_9/query.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
similarity index 100%
rename from tests/src/py/qpid_tests/broker_0_9/queue.py
rename to qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
diff --git a/tests/src/py/qpid_tests/client/client-api-example-tests.py b/qpid/tests/src/py/qpid_tests/client/client-api-example-tests.py
similarity index 100%
rename from tests/src/py/qpid_tests/client/client-api-example-tests.py
rename to qpid/tests/src/py/qpid_tests/client/client-api-example-tests.py
diff --git a/tests/src/py/qpid_tests/client/log4j.conf b/qpid/tests/src/py/qpid_tests/client/log4j.conf
similarity index 100%
rename from tests/src/py/qpid_tests/client/log4j.conf
rename to qpid/tests/src/py/qpid_tests/client/log4j.conf
diff --git a/tools/.gitignore b/qpid/tools/.gitignore
similarity index 100%
rename from tools/.gitignore
rename to qpid/tools/.gitignore
diff --git a/tools/LICENSE.txt b/qpid/tools/LICENSE.txt
similarity index 100%
rename from tools/LICENSE.txt
rename to qpid/tools/LICENSE.txt
diff --git a/tools/NOTICE.txt b/qpid/tools/NOTICE.txt
similarity index 100%
rename from tools/NOTICE.txt
rename to qpid/tools/NOTICE.txt
diff --git a/tools/setup.py b/qpid/tools/setup.py
similarity index 100%
rename from tools/setup.py
rename to qpid/tools/setup.py
diff --git a/tools/src/py/.gitignore b/qpid/tools/src/py/.gitignore
similarity index 100%
rename from tools/src/py/.gitignore
rename to qpid/tools/src/py/.gitignore
diff --git a/tools/src/py/README.txt b/qpid/tools/src/py/README.txt
similarity index 100%
rename from tools/src/py/README.txt
rename to qpid/tools/src/py/README.txt
diff --git a/tools/src/py/qmf-tool b/qpid/tools/src/py/qmf-tool
similarity index 100%
rename from tools/src/py/qmf-tool
rename to qpid/tools/src/py/qmf-tool
diff --git a/tools/src/py/qpid-cluster b/qpid/tools/src/py/qpid-cluster
similarity index 100%
rename from tools/src/py/qpid-cluster
rename to qpid/tools/src/py/qpid-cluster
diff --git a/tools/src/py/qpid-cluster-store b/qpid/tools/src/py/qpid-cluster-store
similarity index 100%
rename from tools/src/py/qpid-cluster-store
rename to qpid/tools/src/py/qpid-cluster-store
diff --git a/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config
similarity index 100%
rename from tools/src/py/qpid-config
rename to qpid/tools/src/py/qpid-config
diff --git a/tools/src/py/qpid-printevents b/qpid/tools/src/py/qpid-printevents
similarity index 100%
rename from tools/src/py/qpid-printevents
rename to qpid/tools/src/py/qpid-printevents
diff --git a/tools/src/py/qpid-queue-stats b/qpid/tools/src/py/qpid-queue-stats
similarity index 100%
rename from tools/src/py/qpid-queue-stats
rename to qpid/tools/src/py/qpid-queue-stats
diff --git a/tools/src/py/qpid-route b/qpid/tools/src/py/qpid-route
similarity index 100%
rename from tools/src/py/qpid-route
rename to qpid/tools/src/py/qpid-route
diff --git a/tools/src/py/qpid-stat b/qpid/tools/src/py/qpid-stat
similarity index 100%
rename from tools/src/py/qpid-stat
rename to qpid/tools/src/py/qpid-stat
diff --git a/tools/src/py/qpid-tool b/qpid/tools/src/py/qpid-tool
similarity index 100%
rename from tools/src/py/qpid-tool
rename to qpid/tools/src/py/qpid-tool
diff --git a/wcf/LICENSE.txt b/qpid/wcf/LICENSE.txt
similarity index 100%
rename from wcf/LICENSE.txt
rename to qpid/wcf/LICENSE.txt
diff --git a/wcf/NOTICE.txt b/qpid/wcf/NOTICE.txt
similarity index 100%
rename from wcf/NOTICE.txt
rename to qpid/wcf/NOTICE.txt
diff --git a/wcf/QpidWcf.sln b/qpid/wcf/QpidWcf.sln
similarity index 100%
rename from wcf/QpidWcf.sln
rename to qpid/wcf/QpidWcf.sln
diff --git a/wcf/ReadMe.txt b/qpid/wcf/ReadMe.txt
similarity index 100%
rename from wcf/ReadMe.txt
rename to qpid/wcf/ReadMe.txt
diff --git a/wcf/samples/Channel/AppConfig/ConfigDemo.cs b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.cs
similarity index 100%
rename from wcf/samples/Channel/AppConfig/ConfigDemo.cs
rename to qpid/wcf/samples/Channel/AppConfig/ConfigDemo.cs
diff --git a/wcf/samples/Channel/AppConfig/ConfigDemo.csproj b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
similarity index 100%
rename from wcf/samples/Channel/AppConfig/ConfigDemo.csproj
rename to qpid/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
diff --git a/wcf/samples/Channel/HelloWorld/HelloWorld.cs b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.cs
similarity index 100%
rename from wcf/samples/Channel/HelloWorld/HelloWorld.cs
rename to qpid/wcf/samples/Channel/HelloWorld/HelloWorld.cs
diff --git a/wcf/samples/Channel/HelloWorld/HelloWorld.csproj b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
similarity index 100%
rename from wcf/samples/Channel/HelloWorld/HelloWorld.csproj
rename to qpid/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
rename to qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
rename to qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
rename to qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
rename to qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
rename to qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
rename to qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln b/qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
rename to qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln b/qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
similarity index 100%
rename from wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
rename to qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
diff --git a/wcf/samples/Integration/Drain/Drain.cs b/qpid/wcf/samples/Integration/Drain/Drain.cs
similarity index 100%
rename from wcf/samples/Integration/Drain/Drain.cs
rename to qpid/wcf/samples/Integration/Drain/Drain.cs
diff --git a/wcf/samples/Integration/Drain/Drain.csproj b/qpid/wcf/samples/Integration/Drain/Drain.csproj
similarity index 100%
rename from wcf/samples/Integration/Drain/Drain.csproj
rename to qpid/wcf/samples/Integration/Drain/Drain.csproj
diff --git a/wcf/samples/Integration/Integration.sln b/qpid/wcf/samples/Integration/Integration.sln
similarity index 100%
rename from wcf/samples/Integration/Integration.sln
rename to qpid/wcf/samples/Integration/Integration.sln
diff --git a/wcf/samples/Integration/Spout/Spout.cs b/qpid/wcf/samples/Integration/Spout/Spout.cs
similarity index 100%
rename from wcf/samples/Integration/Spout/Spout.cs
rename to qpid/wcf/samples/Integration/Spout/Spout.cs
diff --git a/wcf/samples/Integration/Spout/Spout.csproj b/qpid/wcf/samples/Integration/Spout/Spout.csproj
similarity index 100%
rename from wcf/samples/Integration/Spout/Spout.csproj
rename to qpid/wcf/samples/Integration/Spout/Spout.csproj
diff --git a/wcf/samples/Integration/Util/Options.cs b/qpid/wcf/samples/Integration/Util/Options.cs
similarity index 100%
rename from wcf/samples/Integration/Util/Options.cs
rename to qpid/wcf/samples/Integration/Util/Options.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat b/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
rename to qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
diff --git a/wcf/src/Apache/Qpid/Channel/Channel.csproj b/qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/Channel.csproj
rename to qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
diff --git a/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs b/qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
diff --git a/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs b/qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessage.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/RawMessage.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
similarity index 100%
rename from wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
rename to qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
diff --git a/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp b/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
rename to qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpConnection.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/AmqpConnection.h
rename to qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpMessage.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/AmqpMessage.h
rename to qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpSession.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/AmqpSession.h
rename to qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
diff --git a/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
rename to qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
diff --git a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
rename to qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
diff --git a/wcf/src/Apache/Qpid/Interop/InputLink.cpp b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/InputLink.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/InputLink.h b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/InputLink.h
rename to qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
diff --git a/wcf/src/Apache/Qpid/Interop/Interop.vcproj b/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/Interop.vcproj
rename to qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
diff --git a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
rename to qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
diff --git a/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/MessageWaiter.h b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/MessageWaiter.h
rename to qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
diff --git a/wcf/src/Apache/Qpid/Interop/OutputLink.cpp b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/OutputLink.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/OutputLink.h b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/OutputLink.h
rename to qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/QpidAddress.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/QpidAddress.h
rename to qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidException.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/QpidException.h
rename to qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidMarshal.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/QpidMarshal.h
rename to qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
diff --git a/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
rename to qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/XaTransaction.h b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.h
similarity index 100%
rename from wcf/src/Apache/Qpid/Interop/XaTransaction.h
rename to qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.h
diff --git a/wcf/src/wcfnet.snk b/qpid/wcf/src/wcfnet.snk
similarity index 100%
rename from wcf/src/wcfnet.snk
rename to qpid/wcf/src/wcfnet.snk
Binary files differ
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
similarity index 100%
rename from wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
rename to qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
diff --git a/wcf/tools/QCreate/QCreate.cpp b/qpid/wcf/tools/QCreate/QCreate.cpp
similarity index 100%
rename from wcf/tools/QCreate/QCreate.cpp
rename to qpid/wcf/tools/QCreate/QCreate.cpp
diff --git a/wcf/tools/QCreate/QCreate.sln b/qpid/wcf/tools/QCreate/QCreate.sln
similarity index 100%
rename from wcf/tools/QCreate/QCreate.sln
rename to qpid/wcf/tools/QCreate/QCreate.sln
diff --git a/wcf/tools/QCreate/QCreate.vcproj b/qpid/wcf/tools/QCreate/QCreate.vcproj
similarity index 100%
rename from wcf/tools/QCreate/QCreate.vcproj
rename to qpid/wcf/tools/QCreate/QCreate.vcproj
diff --git a/wcf/tools/QCreate/ReadMe.txt b/qpid/wcf/tools/QCreate/ReadMe.txt
similarity index 100%
rename from wcf/tools/QCreate/ReadMe.txt
rename to qpid/wcf/tools/QCreate/ReadMe.txt
diff --git a/wcf/tools/QCreate/stdafx.cpp b/qpid/wcf/tools/QCreate/stdafx.cpp
similarity index 100%
rename from wcf/tools/QCreate/stdafx.cpp
rename to qpid/wcf/tools/QCreate/stdafx.cpp
diff --git a/wcf/tools/QCreate/stdafx.h b/qpid/wcf/tools/QCreate/stdafx.h
similarity index 100%
rename from wcf/tools/QCreate/stdafx.h
rename to qpid/wcf/tools/QCreate/stdafx.h
diff --git a/wcf/tools/QCreate/targetver.h b/qpid/wcf/tools/QCreate/targetver.h
similarity index 100%
rename from wcf/tools/QCreate/targetver.h
rename to qpid/wcf/tools/QCreate/targetver.h
diff --git a/specs/amqp.0-10.dtd b/specs/amqp.0-10.dtd
deleted file mode 100644
index 2be1985..0000000
--- a/specs/amqp.0-10.dtd
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Copyright Notice
-  ================
-  (c) Copyright Cisco Systems, Credit Suisse, Deutsche Börse Systems, Envoy Technologies, Inc.,
-  Goldman Sachs, IONA Technologies PLC, iMatix Corporation sprl.,JPMorgan Chase Bank Inc. N.A, 
-  Novell, Rabbit Technologies Ltd., Red Hat, Inc., TWIST Process Innovations ltd, and 29West Inc
-  2006, 2007. All rights reserved.
-
-  License
-  =======
-  JPMorgan Chase Bank & Co., Cisco Systems, Inc., Envoy Technologies Inc., iMatix Corporation, IONA
-  Technologies, Red Hat, Inc., TWIST Process Innovations, and 29West Inc. (collectively, the
-  "Authors") each hereby grants to you a worldwide, perpetual, royalty-free, nontransferable,
-  nonexclusive license to (i) copy, display, distribute and implement the Advanced Messaging Queue
-  Protocol ("AMQP") Specification and (ii) the Licensed Claims that are held by the Authors, all for
-  the purpose of implementing the Advanced Messaging Queue Protocol Specification. Your license and
-  any rights under this Agreement will terminate immediately without notice from any Author if you
-  bring any claim, suit, demand, or action related to the Advanced Messaging Queue Protocol
-  Specification against any Author. Upon termination, you shall destroy all copies of the Advanced
-  Messaging Queue Protocol Specification in your possession or control.
-
-  As used hereunder, "Licensed Claims" means those claims of a patent or patent application,
-  throughout the world, excluding design patents and design registrations, owned or controlled, or
-  that can be sublicensed without fee and in compliance with the requirements of this Agreement, by
-  an Author or its affiliates now or at any future time and which would necessarily be infringed by
-  implementation of the Advanced Messaging Queue Protocol Specification. A claim is necessarily
-  infringed hereunder only when it is not possible to avoid infringing it because there is no
-  plausible non-infringing alternative for implementing the required portions of the Advanced
-  Messaging Queue Protocol Specification. Notwithstanding the foregoing, Licensed Claims shall not
-  include any claims other than as set forth above even if contained in the same patent as Licensed
-  Claims; or that read solely on any implementations of any portion of the Advanced Messaging Queue
-  Protocol Specification that are not required by the Advanced Messaging Queue Protocol
-  Specification, or that, if licensed, would require a payment of royalties by the licensor to
-  unaffiliated third parties. Moreover, Licensed Claims shall not include (i) any enabling
-  technologies that may be necessary to make or use any Licensed Product but are not themselves
-  expressly set forth in the Advanced Messaging Queue Protocol Specification (e.g., semiconductor
-  manufacturing technology, compiler technology, object oriented technology, networking technology,
-  operating system technology, and the like); or (ii) the implementation of other published
-  standards developed elsewhere and merely referred to in the body of the Advanced Messaging Queue
-  Protocol Specification, or (iii) any Licensed Product and any combinations thereof the purpose or
-  function of which is not required for compliance with the Advanced Messaging Queue Protocol
-  Specification. For purposes of this definition, the Advanced Messaging Queue Protocol
-  Specification shall be deemed to include both architectural and interconnection requirements
-  essential for interoperability and may also include supporting source code artifacts where such
-  architectural, interconnection requirements and source code artifacts are expressly identified as
-  being required or documentation to achieve compliance with the Advanced Messaging Queue Protocol
-  Specification.
-
-  As used hereunder, "Licensed Products" means only those specific portions of products (hardware,
-  software or combinations thereof) that implement and are compliant with all relevant portions of
-  the Advanced Messaging Queue Protocol Specification.
-
-  The following disclaimers, which you hereby also acknowledge as to any use you may make of the
-  Advanced Messaging Queue Protocol Specification:
-
-  THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
-  REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS
-  OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
-  IMPLEMENTATION OF THE ADVANCED MESSAGING QUEUE PROTOCOL SPECIFICATION WILL NOT INFRINGE ANY THIRD
-  PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-  DAMAGES ARISING OUT OF OR RELATING TO ANY USE, IMPLEMENTATION OR OF THE ADVANCED
-  MESSAGING QUEUE PROTOCOL SPECIFICATION.
-
-  The name and trademarks of the Authors may NOT be used in any manner, including advertising or
-  publicity pertaining to the Advanced Messaging Queue Protocol Specification or its contents
-  without specific, written prior permission. Title to copyright in the Advanced Messaging Queue
-  Protocol Specification will at all times remain with the Authors.
-
-  No other rights are granted by implication, estoppel or otherwise.
-
-  Upon termination of your license or rights under this Agreement, you shall destroy all copies of
-  the Advanced Messaging Queue Protocol Specification in your possession or control.
-
-  Trademarks
-  ==========
-  "JPMorgan", "JPMorgan Chase", "Chase", the JPMorgan Chase logo and the Octagon Symbol are
-  trademarks of JPMorgan Chase & Co.
-
-  IMATIX and the iMatix logo are trademarks of iMatix Corporation sprl.
-
-  IONA, IONA Technologies, and the IONA logos are trademarks of IONA Technologies PLC and/or its
-  subsidiaries.
-
-  LINUX is a trademark of Linus Torvalds. RED HAT and JBOSS are registered trademarks of Red Hat,
-  Inc. in the US and other countries.
-
-  Java, all Java-based trademarks and OpenOffice.org are trademarks of Sun Microsystems, Inc. in the
-  United States, other countries, or both.
-
-  Other company, product, or service names may be trademarks or service marks of others.
-
-  Links to full AMQP specification:
-  =================================
-  http://www.envoytech.org/spec/amq/
-  http://www.iona.com/opensource/amqp/
-  http://www.redhat.com/solutions/specifications/amqp/
-  http://www.twiststandards.org/tiki-index.php?page=AMQ
-  http://www.imatix.com/amqp
--->
-
-<!ELEMENT amqp (doc|type|struct|domain|constant|class)*>
-<!ATTLIST amqp
-    xmlns CDATA #IMPLIED
-	major CDATA #REQUIRED
-	minor CDATA #REQUIRED
-	port CDATA #REQUIRED
-	comment CDATA #IMPLIED
->
-
-<!ELEMENT constant (doc|rule)*>
-<!ATTLIST constant
-	name CDATA #REQUIRED
-	value CDATA #REQUIRED
-	label CDATA #IMPLIED
->
-
-<!ELEMENT type (doc|rule)*>
-<!ATTLIST type
-        name CDATA #REQUIRED
-        label CDATA #IMPLIED
-        code CDATA #IMPLIED
-        fixed-width CDATA #IMPLIED
-        variable-width CDATA #IMPLIED
->
-
-<!ELEMENT domain (doc|rule|enum)*>
-<!ATTLIST domain
-	name CDATA #REQUIRED
-	type CDATA #IMPLIED
-	label CDATA #IMPLIED
->
-
-<!ELEMENT struct (field|doc|rule)*>
-<!ATTLIST struct
-        name CDATA #REQUIRED
-        label CDATA #IMPLIED
-        size (0|1|2|4) #IMPLIED
-        pack (0|1|2|4) #IMPLIED
-        code CDATA #IMPLIED>
-
-<!ELEMENT enum (choice)*>
-
-<!ELEMENT choice (doc|rule)*>
-<!ATTLIST choice
-        name CDATA #REQUIRED
-        value CDATA #REQUIRED
->
-
-<!ELEMENT class (doc|role|rule|struct|domain|control|command)*>
-<!ATTLIST class
-	name CDATA #REQUIRED
-	code CDATA #REQUIRED
-	label CDATA #IMPLIED
->
-
-<!ELEMENT role (doc|rule)*>
-<!ATTLIST role
-        name CDATA #REQUIRED
-        implement (MAY|SHOULD|MUST) #REQUIRED
->
-
-<!ELEMENT control (doc|implement|rule|field|response)*>
-<!ATTLIST control
-	name CDATA #REQUIRED
-	code CDATA #REQUIRED
-	label CDATA #IMPLIED
->
-
-<!ELEMENT command ((doc|implement|rule|exception|field|response)*, result?, segments?)>
-<!ATTLIST command
-	name CDATA #REQUIRED
-	code CDATA #REQUIRED
-	label CDATA #IMPLIED
->
-
-<!ELEMENT implement (doc|rule)*>
-<!ATTLIST implement
-        role CDATA #REQUIRED
-	handle (MAY|SHOULD|MUST) #REQUIRED
-        send (MAY|SHOULD|MUST) #IMPLIED
->
-
-<!ELEMENT field (doc|rule|exception)*>
-<!ATTLIST field
-	name CDATA #REQUIRED
-	type CDATA #IMPLIED
-        default CDATA #IMPLIED
-	code CDATA #IMPLIED
-	label CDATA #IMPLIED
-	required CDATA #IMPLIED
->
-
-<!ELEMENT rule (doc*)>
-<!ATTLIST rule
-	name CDATA #REQUIRED
-	label CDATA #IMPLIED
->
-
-<!ELEMENT exception (doc*)>
-<!ATTLIST exception
-	name CDATA #REQUIRED
-	error-code CDATA #IMPLIED
-	label CDATA #IMPLIED
->
-
-<!ELEMENT response (doc|rule)*>
-<!ATTLIST response
-	name CDATA #IMPLIED
->
-
-<!ELEMENT result (doc|rule|struct)*>
-<!ATTLIST result
-        type CDATA #IMPLIED
->
-
-<!ELEMENT segments (doc|rule|header|body)*>
-
-<!ELEMENT header (doc|rule|entry)*>
-<!ATTLIST header
-        required (true|false) #IMPLIED
->
-
-<!ELEMENT entry (doc|rule)*>
-<!ATTLIST entry
-        type CDATA #REQUIRED
->
-
-<!ELEMENT body (doc|rule)*>
-<!ATTLIST body
-    required (true|false) #IMPLIED
->
-
-<!ELEMENT doc (#PCDATA|xref)*>
-<!ATTLIST doc
-	type (grammar|scenario|picture|bnf|todo) #IMPLIED
-	title CDATA #IMPLIED
->
-
-<!ELEMENT  xref (#PCDATA)>
-<!ATTLIST xref
-  ref CDATA #REQUIRED>