Minor packaging fixes; no actual code changes

- Make the source directory unversioned
- Set MOS Linux team as a maintainer
- Change the revision according to the new versioning policy.

blueprint separate-mos-from-linux

Change-Id: I1ec952aae2a9a1757ea02590eb34e5ae404b4b5a

diff --git a/debian/changelog b/debian/changelog
index c660575bd8ee403bd5eddf4c9ef9066e430d80df..073ca5146da1df044c0e5df8aa204d46f21da944 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+rabbitmq-server (3.3.5-1~u14.04+mos1) mos6.1; urgency=medium
+
+  * Adjust the package revision according to the versioning policy
+    stated in the separate-mos-from-linux blueprint.
+
+ -- Alexei Sheplyakov <asheplyakov@mirantis.com>  Thu, 09 Apr 2015 16:33:12 +0300
+
+rabbitmq-server (3.3.5-1~mos6.1+0b1) trusty; urgency=low
+
+  * Minor packaging fixes; no actual code changes:
+    - rename the source directory (make it unversioned)
+    - fix the package meta-data (proper Maintainer, etc)
+
+ -- Alexei Sheplyakov <asheplyakov@mirantis.com>  Fri, 27 Mar 2015 14:43:20 +0300
+
 rabbitmq-server (3.3.5-1~mos6.1) trusty; urgency=low
 
   * Pick the source from packages/precise/rabbitmq-server, commit

diff --git a/debian/control b/debian/control
index 02d23547dd8f2489a33a5e4fdd9086178665036f..944fae4a92e283293af82f2a763316c4f781bc92 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,9 @@
 Source: rabbitmq-server
 Section: net
 Priority: extra
-Maintainer: RabbitMQ Team <packaging@rabbitmq.com>
-Uploaders: Emile Joubert <emile@rabbitmq.com>
-DM-Upload-Allowed: yes
-Build-Depends: cdbs, debhelper (>= 5), erlang-dev, python-simplejson, xmlto, xsltproc, erlang-nox (>= 1:13.b.3), erlang-src (>= 1:13.b.3), unzip, zip
+Maintainer: MOS Linux team <mos-linux@mirantis.com>
+XSBC-Orig-Maintainer: RabbitMQ Team <packaging@rabbitmq.com>
+Build-Depends: cdbs, debhelper (>= 9), erlang-dev, python-simplejson, xmlto, xsltproc, erlang-nox (>= 1:13.b.3), erlang-src (>= 1:13.b.3), unzip, zip
 Standards-Version: 3.9.2
 
 Package: rabbitmq-server

diff --git a/rabbitmq-server-3.3.5/INSTALL b/rabbitmq-server/INSTALL
similarity index 100%
rename from rabbitmq-server-3.3.5/INSTALL
rename to rabbitmq-server/INSTALL

diff --git a/rabbitmq-server-3.3.5/LICENSE b/rabbitmq-server/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE
rename to rabbitmq-server/LICENSE

diff --git a/rabbitmq-server-3.3.5/LICENSE-APACHE2-ExplorerCanvas b/rabbitmq-server/LICENSE-APACHE2-ExplorerCanvas
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-APACHE2-ExplorerCanvas
rename to rabbitmq-server/LICENSE-APACHE2-ExplorerCanvas

diff --git a/rabbitmq-server-3.3.5/LICENSE-APL2-Stomp-Websocket b/rabbitmq-server/LICENSE-APL2-Stomp-Websocket
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-APL2-Stomp-Websocket
rename to rabbitmq-server/LICENSE-APL2-Stomp-Websocket

diff --git a/rabbitmq-server-3.3.5/LICENSE-Apache-Basho b/rabbitmq-server/LICENSE-Apache-Basho
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-Apache-Basho
rename to rabbitmq-server/LICENSE-Apache-Basho

diff --git a/rabbitmq-server-3.3.5/LICENSE-BSD-base64js b/rabbitmq-server/LICENSE-BSD-base64js
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-BSD-base64js
rename to rabbitmq-server/LICENSE-BSD-base64js

diff --git a/rabbitmq-server-3.3.5/LICENSE-BSD-glMatrix b/rabbitmq-server/LICENSE-BSD-glMatrix
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-BSD-glMatrix
rename to rabbitmq-server/LICENSE-BSD-glMatrix

diff --git a/rabbitmq-server-3.3.5/LICENSE-MIT-EJS10 b/rabbitmq-server/LICENSE-MIT-EJS10
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-MIT-EJS10
rename to rabbitmq-server/LICENSE-MIT-EJS10

diff --git a/rabbitmq-server-3.3.5/LICENSE-MIT-Flot b/rabbitmq-server/LICENSE-MIT-Flot
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-MIT-Flot
rename to rabbitmq-server/LICENSE-MIT-Flot

diff --git a/rabbitmq-server-3.3.5/LICENSE-MIT-Mochi b/rabbitmq-server/LICENSE-MIT-Mochi
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-MIT-Mochi
rename to rabbitmq-server/LICENSE-MIT-Mochi

diff --git a/rabbitmq-server-3.3.5/LICENSE-MIT-Sammy060 b/rabbitmq-server/LICENSE-MIT-Sammy060
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-MIT-Sammy060
rename to rabbitmq-server/LICENSE-MIT-Sammy060

diff --git a/rabbitmq-server-3.3.5/LICENSE-MIT-eldap b/rabbitmq-server/LICENSE-MIT-eldap
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-MIT-eldap
rename to rabbitmq-server/LICENSE-MIT-eldap

diff --git a/rabbitmq-server-3.3.5/LICENSE-MIT-jQuery164 b/rabbitmq-server/LICENSE-MIT-jQuery164
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-MIT-jQuery164
rename to rabbitmq-server/LICENSE-MIT-jQuery164

diff --git a/rabbitmq-server-3.3.5/LICENSE-MPL-RabbitMQ b/rabbitmq-server/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/Makefile b/rabbitmq-server/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/Makefile
rename to rabbitmq-server/Makefile

diff --git a/rabbitmq-server-3.3.5/README b/rabbitmq-server/README
similarity index 100%
rename from rabbitmq-server-3.3.5/README
rename to rabbitmq-server/README

diff --git a/rabbitmq-server-3.3.5/calculate-relative b/rabbitmq-server/calculate-relative
similarity index 100%
rename from rabbitmq-server-3.3.5/calculate-relative
rename to rabbitmq-server/calculate-relative

diff --git a/rabbitmq-server-3.3.5/codegen.py b/rabbitmq-server/codegen.py
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen.py
rename to rabbitmq-server/codegen.py

diff --git a/rabbitmq-server-3.3.5/codegen/LICENSE b/rabbitmq-server/codegen/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/LICENSE
rename to rabbitmq-server/codegen/LICENSE

diff --git a/rabbitmq-server-3.3.5/codegen/LICENSE-MPL-RabbitMQ b/rabbitmq-server/codegen/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/codegen/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/codegen/Makefile b/rabbitmq-server/codegen/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/Makefile
rename to rabbitmq-server/codegen/Makefile

diff --git a/rabbitmq-server-3.3.5/codegen/README.extensions.md b/rabbitmq-server/codegen/README.extensions.md
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/README.extensions.md
rename to rabbitmq-server/codegen/README.extensions.md

diff --git a/rabbitmq-server-3.3.5/codegen/amqp-rabbitmq-0.8.json b/rabbitmq-server/codegen/amqp-rabbitmq-0.8.json
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/amqp-rabbitmq-0.8.json
rename to rabbitmq-server/codegen/amqp-rabbitmq-0.8.json

diff --git a/rabbitmq-server-3.3.5/codegen/amqp-rabbitmq-0.9.1.json b/rabbitmq-server/codegen/amqp-rabbitmq-0.9.1.json
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/amqp-rabbitmq-0.9.1.json
rename to rabbitmq-server/codegen/amqp-rabbitmq-0.9.1.json

diff --git a/rabbitmq-server-3.3.5/codegen/amqp_codegen.py b/rabbitmq-server/codegen/amqp_codegen.py
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/amqp_codegen.py
rename to rabbitmq-server/codegen/amqp_codegen.py

diff --git a/rabbitmq-server-3.3.5/codegen/credit_extension.json b/rabbitmq-server/codegen/credit_extension.json
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/credit_extension.json
rename to rabbitmq-server/codegen/credit_extension.json

diff --git a/rabbitmq-server-3.3.5/codegen/demo_extension.json b/rabbitmq-server/codegen/demo_extension.json
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/demo_extension.json
rename to rabbitmq-server/codegen/demo_extension.json

diff --git a/rabbitmq-server-3.3.5/codegen/license_info b/rabbitmq-server/codegen/license_info
similarity index 100%
rename from rabbitmq-server-3.3.5/codegen/license_info
rename to rabbitmq-server/codegen/license_info

diff --git a/rabbitmq-server-3.3.5/docs/examples-to-end.xsl b/rabbitmq-server/docs/examples-to-end.xsl
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/examples-to-end.xsl
rename to rabbitmq-server/docs/examples-to-end.xsl

diff --git a/rabbitmq-server-3.3.5/docs/html-to-website-xml.xsl b/rabbitmq-server/docs/html-to-website-xml.xsl
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/html-to-website-xml.xsl
rename to rabbitmq-server/docs/html-to-website-xml.xsl

diff --git a/rabbitmq-server-3.3.5/docs/rabbitmq-echopid.xml b/rabbitmq-server/docs/rabbitmq-echopid.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/rabbitmq-echopid.xml
rename to rabbitmq-server/docs/rabbitmq-echopid.xml

diff --git a/rabbitmq-server-3.3.5/docs/rabbitmq-env.conf.5.xml b/rabbitmq-server/docs/rabbitmq-env.conf.5.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/rabbitmq-env.conf.5.xml
rename to rabbitmq-server/docs/rabbitmq-env.conf.5.xml

diff --git a/rabbitmq-server-3.3.5/docs/rabbitmq-plugins.1.xml b/rabbitmq-server/docs/rabbitmq-plugins.1.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/rabbitmq-plugins.1.xml
rename to rabbitmq-server/docs/rabbitmq-plugins.1.xml

diff --git a/rabbitmq-server-3.3.5/docs/rabbitmq-server.1.xml b/rabbitmq-server/docs/rabbitmq-server.1.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/rabbitmq-server.1.xml
rename to rabbitmq-server/docs/rabbitmq-server.1.xml

diff --git a/rabbitmq-server-3.3.5/docs/rabbitmq-service.xml b/rabbitmq-server/docs/rabbitmq-service.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/rabbitmq-service.xml
rename to rabbitmq-server/docs/rabbitmq-service.xml

diff --git a/rabbitmq-server-3.3.5/docs/rabbitmq.config.example b/rabbitmq-server/docs/rabbitmq.config.example
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/rabbitmq.config.example
rename to rabbitmq-server/docs/rabbitmq.config.example

diff --git a/rabbitmq-server-3.3.5/docs/rabbitmqctl.1.xml b/rabbitmq-server/docs/rabbitmqctl.1.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/rabbitmqctl.1.xml
rename to rabbitmq-server/docs/rabbitmqctl.1.xml

diff --git a/rabbitmq-server-3.3.5/docs/remove-namespaces.xsl b/rabbitmq-server/docs/remove-namespaces.xsl
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/remove-namespaces.xsl
rename to rabbitmq-server/docs/remove-namespaces.xsl

diff --git a/rabbitmq-server-3.3.5/docs/usage.xsl b/rabbitmq-server/docs/usage.xsl
similarity index 100%
rename from rabbitmq-server-3.3.5/docs/usage.xsl
rename to rabbitmq-server/docs/usage.xsl

diff --git a/rabbitmq-server-3.3.5/ebin/rabbit_app.in b/rabbitmq-server/ebin/rabbit_app.in
similarity index 100%
rename from rabbitmq-server-3.3.5/ebin/rabbit_app.in
rename to rabbitmq-server/ebin/rabbit_app.in

diff --git a/rabbitmq-server-3.3.5/generate_app b/rabbitmq-server/generate_app
similarity index 100%
rename from rabbitmq-server-3.3.5/generate_app
rename to rabbitmq-server/generate_app

diff --git a/rabbitmq-server-3.3.5/generate_deps b/rabbitmq-server/generate_deps
similarity index 100%
rename from rabbitmq-server-3.3.5/generate_deps
rename to rabbitmq-server/generate_deps

diff --git a/rabbitmq-server-3.3.5/include/gm_specs.hrl b/rabbitmq-server/include/gm_specs.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/include/gm_specs.hrl
rename to rabbitmq-server/include/gm_specs.hrl

diff --git a/rabbitmq-server-3.3.5/include/rabbit.hrl b/rabbitmq-server/include/rabbit.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/include/rabbit.hrl
rename to rabbitmq-server/include/rabbit.hrl

diff --git a/rabbitmq-server-3.3.5/include/rabbit_msg_store.hrl b/rabbitmq-server/include/rabbit_msg_store.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/include/rabbit_msg_store.hrl
rename to rabbitmq-server/include/rabbit_msg_store.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/Makefile b/rabbitmq-server/plugins-src/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/Makefile
rename to rabbitmq-server/plugins-src/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/README b/rabbitmq-server/plugins-src/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/README
rename to rabbitmq-server/plugins-src/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/all-packages.mk b/rabbitmq-server/plugins-src/all-packages.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/all-packages.mk
rename to rabbitmq-server/plugins-src/all-packages.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/common.mk b/rabbitmq-server/plugins-src/common.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/common.mk
rename to rabbitmq-server/plugins-src/common.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/.srcdist_done b/rabbitmq-server/plugins-src/cowboy-wrapper/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/.srcdist_done
rename to rabbitmq-server/plugins-src/cowboy-wrapper/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0001-R12-fake-iodata-type.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0001-R12-fake-iodata-type.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0001-R12-fake-iodata-type.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0001-R12-fake-iodata-type.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0002-R12-drop-all-references-to-boolean-type.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0002-R12-drop-all-references-to-boolean-type.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0002-R12-drop-all-references-to-boolean-type.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0002-R12-drop-all-references-to-boolean-type.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0003-R12-drop-all-references-to-reference-type.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0003-R12-drop-all-references-to-reference-type.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0003-R12-drop-all-references-to-reference-type.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0003-R12-drop-all-references-to-reference-type.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0004-R12-drop-references-to-iodata-type.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0004-R12-drop-references-to-iodata-type.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0004-R12-drop-references-to-iodata-type.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0004-R12-drop-references-to-iodata-type.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0005-R12-drop-references-to-Default-any-type.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0005-R12-drop-references-to-Default-any-type.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0005-R12-drop-references-to-Default-any-type.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0005-R12-drop-references-to-Default-any-type.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0006-Use-erlang-integer_to_list-and-lists-max-instead-of-.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0006-Use-erlang-integer_to_list-and-lists-max-instead-of-.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0006-Use-erlang-integer_to_list-and-lists-max-instead-of-.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0006-Use-erlang-integer_to_list-and-lists-max-instead-of-.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0007-R12-type-definitions-must-be-ordered.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0007-R12-type-definitions-must-be-ordered.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0007-R12-type-definitions-must-be-ordered.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0007-R12-type-definitions-must-be-ordered.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0008-sec-websocket-protocol.patch b/rabbitmq-server/plugins-src/cowboy-wrapper/0008-sec-websocket-protocol.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/0008-sec-websocket-protocol.patch
rename to rabbitmq-server/plugins-src/cowboy-wrapper/0008-sec-websocket-protocol.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/Makefile b/rabbitmq-server/plugins-src/cowboy-wrapper/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/Makefile
rename to rabbitmq-server/plugins-src/cowboy-wrapper/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/README.md b/rabbitmq-server/plugins-src/cowboy-wrapper/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/README.md
rename to rabbitmq-server/plugins-src/cowboy-wrapper/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/.done b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/.done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/.done
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/.done

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/.travis.yml b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/.travis.yml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/.travis.yml
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/.travis.yml

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/AUTHORS b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/AUTHORS
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/AUTHORS
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/AUTHORS

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/CHANGELOG.md b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/CHANGELOG.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/CHANGELOG.md
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/CHANGELOG.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/LICENSE b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/LICENSE
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/Makefile b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/Makefile
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/README.md b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/README.md
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/cover.spec b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/cover.spec
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/cover.spec
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/cover.spec

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/doc/overview.edoc b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/doc/overview.edoc
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/doc/overview.edoc
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/doc/overview.edoc

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/include/http.hrl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/include/http.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/include/http.hrl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/include/http.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/rebar.config b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/rebar.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/rebar.config
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/rebar.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.app.src b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.app.src
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptor.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptor.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptor.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptors_sup.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptors_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptors_sup.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_acceptors_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_app.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_app.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_bstr.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_bstr.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_bstr.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_bstr.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_clock.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_clock.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_clock.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_clock.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_cookies.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_cookies.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_cookies.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_cookies.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_dispatcher.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_dispatcher.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_dispatcher.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_dispatcher.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_handler.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_handler.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_protocol.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_protocol.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_protocol.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_protocol.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl.orig b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl.orig
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl.orig
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_req.erl.orig

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_rest.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_rest.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_rest.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_rest.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_static.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_static.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_static.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_static.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket_handler.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket_handler.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_http_websocket_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener_sup.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener_sup.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_listener_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_multipart.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_multipart.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_multipart.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_multipart.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_protocol.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_protocol.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_protocol.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_protocol.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_requests_sup.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_requests_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_requests_sup.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_requests_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_ssl_transport.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_ssl_transport.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_ssl_transport.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_ssl_transport.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_sup.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_sup.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_tcp_transport.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_tcp_transport.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_tcp_transport.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/src/cowboy_tcp_transport.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/chunked_handler.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/chunked_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/chunked_handler.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/chunked_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/dispatcher_prop.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/dispatcher_prop.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/dispatcher_prop.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/dispatcher_prop.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/cert.pem b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/cert.pem
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/cert.pem
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/cert.pem

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/key.pem b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/key.pem
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/key.pem
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_SUITE_data/key.pem

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_errors.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_errors.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_errors.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_errors.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_init_shutdown.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_init_shutdown.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_init_shutdown.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_init_shutdown.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_long_polling.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_long_polling.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_long_polling.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_long_polling.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_multipart.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_multipart.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_multipart.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_multipart.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_set_resp.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_set_resp.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_set_resp.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_set_resp.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_stream_body.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_stream_body.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_stream_body.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/http_handler_stream_body.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/proper_SUITE.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/proper_SUITE.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/proper_SUITE.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/proper_SUITE.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/rest_forbidden_resource.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/rest_forbidden_resource.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/rest_forbidden_resource.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/rest_forbidden_resource.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/rest_simple_resource.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/rest_simple_resource.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/rest_simple_resource.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/rest_simple_resource.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler_init_shutdown.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler_init_shutdown.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler_init_shutdown.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/websocket_handler_init_shutdown.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/ws_SUITE.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/ws_SUITE.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/ws_SUITE.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/ws_SUITE.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/ws_timeout_hibernate_handler.erl b/rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/ws_timeout_hibernate_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/cowboy-git/test/ws_timeout_hibernate_handler.erl
rename to rabbitmq-server/plugins-src/cowboy-wrapper/cowboy-git/test/ws_timeout_hibernate_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/hash.mk b/rabbitmq-server/plugins-src/cowboy-wrapper/hash.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/hash.mk
rename to rabbitmq-server/plugins-src/cowboy-wrapper/hash.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/package.mk b/rabbitmq-server/plugins-src/cowboy-wrapper/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/cowboy-wrapper/package.mk
rename to rabbitmq-server/plugins-src/cowboy-wrapper/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/do-package.mk b/rabbitmq-server/plugins-src/do-package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/do-package.mk
rename to rabbitmq-server/plugins-src/do-package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/.srcdist_done b/rabbitmq-server/plugins-src/eldap-wrapper/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/.srcdist_done
rename to rabbitmq-server/plugins-src/eldap-wrapper/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/LICENSE-MIT-eldap b/rabbitmq-server/plugins-src/eldap-wrapper/LICENSE-MIT-eldap
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/LICENSE-MIT-eldap
rename to rabbitmq-server/plugins-src/eldap-wrapper/LICENSE-MIT-eldap

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/Makefile b/rabbitmq-server/plugins-src/eldap-wrapper/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/Makefile
rename to rabbitmq-server/plugins-src/eldap-wrapper/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-appify.patch b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-appify.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-appify.patch
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-appify.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/.done b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/.done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/.done
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/.done

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/LICENSE b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/LICENSE
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/Makefile b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/Makefile
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/README b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/README
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/doc/README.example b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/doc/README.example
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/doc/README.example
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/doc/README.example

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/doc/short-desc b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/doc/short-desc
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/doc/short-desc
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/doc/short-desc

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/ebin/eldap.app b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/ebin/eldap.app
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/ebin/eldap.app
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/ebin/eldap.app

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/include/eldap.hrl b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/include/eldap.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/include/eldap.hrl
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/include/eldap.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/src/ELDAPv3.asn b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/src/ELDAPv3.asn
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/src/ELDAPv3.asn
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/src/ELDAPv3.asn

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/src/Makefile b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/src/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/src/Makefile
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/src/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/src/eldap.erl b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/src/eldap.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/src/eldap.erl
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/src/eldap.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/README.test b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/README.test
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/README.test
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/README.test

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/bill.ldif b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/bill.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/bill.ldif
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/bill.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/bluetail.ldif b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/bluetail.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/bluetail.ldif
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/bluetail.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/crl.ldif b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/crl.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/crl.ldif
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/crl.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/eldap_test.erl b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/eldap_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/eldap_test.erl
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/eldap_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/ldap.rc b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/ldap.rc
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/ldap.rc
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/ldap.rc

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/people.ldif b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/people.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/people.ldif
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/people.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/post_danmark.ldif b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/post_danmark.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/post_danmark.ldif
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/post_danmark.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/server1.crl b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/server1.crl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/server1.crl
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/server1.crl

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/slapd.conf b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/slapd.conf
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/slapd.conf
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/slapd.conf

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/tobbe.ldif b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/tobbe.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-git/test/tobbe.ldif
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-git/test/tobbe.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-no-ssl-seed.patch b/rabbitmq-server/plugins-src/eldap-wrapper/eldap-no-ssl-seed.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/eldap-no-ssl-seed.patch
rename to rabbitmq-server/plugins-src/eldap-wrapper/eldap-no-ssl-seed.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/hash.mk b/rabbitmq-server/plugins-src/eldap-wrapper/hash.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/hash.mk
rename to rabbitmq-server/plugins-src/eldap-wrapper/hash.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/license_info b/rabbitmq-server/plugins-src/eldap-wrapper/license_info
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/license_info
rename to rabbitmq-server/plugins-src/eldap-wrapper/license_info

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/package.mk b/rabbitmq-server/plugins-src/eldap-wrapper/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/package.mk
rename to rabbitmq-server/plugins-src/eldap-wrapper/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/remove-eldap-fsm.patch b/rabbitmq-server/plugins-src/eldap-wrapper/remove-eldap-fsm.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/remove-eldap-fsm.patch
rename to rabbitmq-server/plugins-src/eldap-wrapper/remove-eldap-fsm.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/remove-ietf-doc.patch b/rabbitmq-server/plugins-src/eldap-wrapper/remove-ietf-doc.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/eldap-wrapper/remove-ietf-doc.patch
rename to rabbitmq-server/plugins-src/eldap-wrapper/remove-ietf-doc.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/generate_app b/rabbitmq-server/plugins-src/generate_app
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/generate_app
rename to rabbitmq-server/plugins-src/generate_app

diff --git a/rabbitmq-server-3.3.5/plugins-src/generate_deps b/rabbitmq-server/plugins-src/generate_deps
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/generate_deps
rename to rabbitmq-server/plugins-src/generate_deps

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-APACHE2-ExplorerCanvas b/rabbitmq-server/plugins-src/licensing/LICENSE-APACHE2-ExplorerCanvas
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-APACHE2-ExplorerCanvas
rename to rabbitmq-server/plugins-src/licensing/LICENSE-APACHE2-ExplorerCanvas

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-APL2-Stomp-Websocket b/rabbitmq-server/plugins-src/licensing/LICENSE-APL2-Stomp-Websocket
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-APL2-Stomp-Websocket
rename to rabbitmq-server/plugins-src/licensing/LICENSE-APL2-Stomp-Websocket

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-Apache-Basho b/rabbitmq-server/plugins-src/licensing/LICENSE-Apache-Basho
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-Apache-Basho
rename to rabbitmq-server/plugins-src/licensing/LICENSE-Apache-Basho

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-BSD-base64js b/rabbitmq-server/plugins-src/licensing/LICENSE-BSD-base64js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-BSD-base64js
rename to rabbitmq-server/plugins-src/licensing/LICENSE-BSD-base64js

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-BSD-glMatrix b/rabbitmq-server/plugins-src/licensing/LICENSE-BSD-glMatrix
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-BSD-glMatrix
rename to rabbitmq-server/plugins-src/licensing/LICENSE-BSD-glMatrix

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-EJS10 b/rabbitmq-server/plugins-src/licensing/LICENSE-MIT-EJS10
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-EJS10
rename to rabbitmq-server/plugins-src/licensing/LICENSE-MIT-EJS10

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-Flot b/rabbitmq-server/plugins-src/licensing/LICENSE-MIT-Flot
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-Flot
rename to rabbitmq-server/plugins-src/licensing/LICENSE-MIT-Flot

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-Mochi b/rabbitmq-server/plugins-src/licensing/LICENSE-MIT-Mochi
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-Mochi
rename to rabbitmq-server/plugins-src/licensing/LICENSE-MIT-Mochi

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-Sammy060 b/rabbitmq-server/plugins-src/licensing/LICENSE-MIT-Sammy060
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-Sammy060
rename to rabbitmq-server/plugins-src/licensing/LICENSE-MIT-Sammy060

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-eldap b/rabbitmq-server/plugins-src/licensing/LICENSE-MIT-eldap
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-eldap
rename to rabbitmq-server/plugins-src/licensing/LICENSE-MIT-eldap

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-jQuery164 b/rabbitmq-server/plugins-src/licensing/LICENSE-MIT-jQuery164
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MIT-jQuery164
rename to rabbitmq-server/plugins-src/licensing/LICENSE-MIT-jQuery164

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MPL-RabbitMQ b/rabbitmq-server/plugins-src/licensing/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/plugins-src/licensing/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/license_info_eldap-wrapper b/rabbitmq-server/plugins-src/licensing/license_info_eldap-wrapper
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/license_info_eldap-wrapper
rename to rabbitmq-server/plugins-src/licensing/license_info_eldap-wrapper

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/license_info_mochiweb-wrapper b/rabbitmq-server/plugins-src/licensing/license_info_mochiweb-wrapper
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/license_info_mochiweb-wrapper
rename to rabbitmq-server/plugins-src/licensing/license_info_mochiweb-wrapper

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/license_info_rabbitmq-management b/rabbitmq-server/plugins-src/licensing/license_info_rabbitmq-management
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/license_info_rabbitmq-management
rename to rabbitmq-server/plugins-src/licensing/license_info_rabbitmq-management

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/license_info_rabbitmq-management-visualiser b/rabbitmq-server/plugins-src/licensing/license_info_rabbitmq-management-visualiser
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/license_info_rabbitmq-management-visualiser
rename to rabbitmq-server/plugins-src/licensing/license_info_rabbitmq-management-visualiser

diff --git a/rabbitmq-server-3.3.5/plugins-src/licensing/license_info_webmachine-wrapper b/rabbitmq-server/plugins-src/licensing/license_info_webmachine-wrapper
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/licensing/license_info_webmachine-wrapper
rename to rabbitmq-server/plugins-src/licensing/license_info_webmachine-wrapper

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/.srcdist_done b/rabbitmq-server/plugins-src/mochiweb-wrapper/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/.srcdist_done
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/10-build-on-R12B-5.patch b/rabbitmq-server/plugins-src/mochiweb-wrapper/10-build-on-R12B-5.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/10-build-on-R12B-5.patch
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/10-build-on-R12B-5.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/20-MAX_RECV_BODY.patch b/rabbitmq-server/plugins-src/mochiweb-wrapper/20-MAX_RECV_BODY.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/20-MAX_RECV_BODY.patch
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/20-MAX_RECV_BODY.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/30-remove-crypto-ssl-dependencies.patch b/rabbitmq-server/plugins-src/mochiweb-wrapper/30-remove-crypto-ssl-dependencies.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/30-remove-crypto-ssl-dependencies.patch
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/30-remove-crypto-ssl-dependencies.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/40-remove-compiler-syntax_tools-dependencies.patch b/rabbitmq-server/plugins-src/mochiweb-wrapper/40-remove-compiler-syntax_tools-dependencies.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/40-remove-compiler-syntax_tools-dependencies.patch
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/40-remove-compiler-syntax_tools-dependencies.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/50-remove-json.patch b/rabbitmq-server/plugins-src/mochiweb-wrapper/50-remove-json.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/50-remove-json.patch
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/50-remove-json.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/LICENSE-MIT-Mochi b/rabbitmq-server/plugins-src/mochiweb-wrapper/LICENSE-MIT-Mochi
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/LICENSE-MIT-Mochi
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/LICENSE-MIT-Mochi

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/Makefile b/rabbitmq-server/plugins-src/mochiweb-wrapper/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/Makefile
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/hash.mk b/rabbitmq-server/plugins-src/mochiweb-wrapper/hash.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/hash.mk
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/hash.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/license_info b/rabbitmq-server/plugins-src/mochiweb-wrapper/license_info
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/license_info
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/license_info

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/.done b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/.done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/.done
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/.done

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/.travis.yml b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/.travis.yml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/.travis.yml
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/.travis.yml

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/CHANGES.md b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/CHANGES.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/CHANGES.md
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/CHANGES.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/LICENSE b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/LICENSE
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/Makefile b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/Makefile
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/README b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/README
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/README b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/README
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api.hrl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api.hrl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_client.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_client.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_client.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_client.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_lib.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_lib.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_lib.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/hmac_api/hmac_api_lib.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/https_store.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/https_store.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/https_store.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/https_store.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_cert.pem b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_cert.pem
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_cert.pem
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_cert.pem

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_key.pem b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_key.pem
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_key.pem
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/https/server_key.pem

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/keepalive/keepalive.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/keepalive/keepalive.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/examples/keepalive/keepalive.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/examples/keepalive/keepalive.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/include/internal.hrl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/include/internal.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/include/internal.hrl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/include/internal.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/rebar b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/rebar
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/rebar
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/rebar

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/rebar.config b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/rebar.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/rebar.config
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/rebar.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/entities.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/entities.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/entities.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/entities.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/new_mochiweb.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/new_mochiweb.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/new_mochiweb.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/scripts/new_mochiweb.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_records.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_records.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_records.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_records.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_std.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_std.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_std.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochifmt_std.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochihex.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochihex.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochihex.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochihex.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochijson.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochijson.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochijson.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochijson.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilists.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilists.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilists.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilists.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilogfile2.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilogfile2.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilogfile2.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochilogfile2.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochitemp.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochitemp.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochitemp.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochitemp.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiutf8.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiutf8.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiutf8.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiutf8.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.app.src b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.app.src
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_acceptor.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_acceptor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_acceptor.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_acceptor.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_base64url.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_base64url.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_base64url.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_base64url.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_charref.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_charref.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_charref.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_charref.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cookies.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cookies.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cookies.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cookies.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cover.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cover.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cover.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_cover.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_echo.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_echo.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_echo.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_echo.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_headers.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_headers.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_headers.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_headers.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_html.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_html.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_html.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_html.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_http.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_http.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_http.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_http.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_io.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_io.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_io.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_io.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_mime.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_mime.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_mime.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_mime.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_multipart.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_multipart.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_multipart.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_multipart.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl.orig b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl.orig
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl.orig
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request.erl.orig

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request_tests.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request_tests.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_request_tests.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_response.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_response.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_response.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_response.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_session.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_session.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_session.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_session.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket_server.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket_server.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket_server.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_socket_server.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_util.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_util.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/mochiweb_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/reloader.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/reloader.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/src/reloader.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/src/reloader.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp.template b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp.template
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp.template
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp.template

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/priv/www/index.html b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/priv/www/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/priv/www/index.html
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/priv/www/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/rebar.config b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/rebar.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/rebar.config
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/rebar.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.app.src b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.app.src
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_app.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_app.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_deps.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_deps.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_deps.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_deps.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_sup.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_sup.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_web.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/src/mochiapp_web.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/start-dev.sh b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/start-dev.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/start-dev.sh
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/templates/mochiwebapp_skel/start-dev.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_cert.pem b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_cert.pem
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_cert.pem
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_cert.pem

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_key.pem b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_key.pem
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_key.pem
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/support/test-materials/test_ssl_key.pem

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_base64url_tests.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_base64url_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_base64url_tests.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_base64url_tests.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_html_tests.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_html_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_html_tests.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_html_tests.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_http_tests.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_http_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_http_tests.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_http_tests.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_tests.erl b/rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_tests.erl
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/mochiweb-git/test/mochiweb_tests.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/package.mk b/rabbitmq-server/plugins-src/mochiweb-wrapper/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/mochiweb-wrapper/package.mk
rename to rabbitmq-server/plugins-src/mochiweb-wrapper/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/Makefile b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/README.md b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/README.md
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/codegen.py b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/codegen.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/codegen.py
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/codegen.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/include/rabbit_amqp1_0.hrl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/include/rabbit_amqp1_0.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/include/rabbit_amqp1_0.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/include/rabbit_amqp1_0.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/package.mk b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/messaging.xml b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/messaging.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/messaging.xml
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/messaging.xml

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/security.xml b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/security.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/security.xml
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/security.xml

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/transactions.xml b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/transactions.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/transactions.xml
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/transactions.xml

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/transport.xml b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/transport.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/transport.xml
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/transport.xml

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/types.xml b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/types.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/spec/types.xml
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/spec/types.xml

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_generator.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_generator.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_generator.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_generator.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_parser.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_parser.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_parser.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_binary_parser.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_channel.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_channel.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_channel.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_channel.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_framing.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_framing.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_framing.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_framing.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_incoming_link.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_incoming_link.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_incoming_link.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_incoming_link.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_link_util.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_link_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_link_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_link_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_message.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_message.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_message.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_message.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_outgoing_link.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_outgoing_link.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_outgoing_link.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_outgoing_link.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_reader.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_reader.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_reader.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_reader.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_process.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_process.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_process.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_process.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_session_sup_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_util.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_writer.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_writer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_writer.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbit_amqp1_0_writer.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbitmq_amqp1_0.app.src b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbitmq_amqp1_0.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/src/rabbitmq_amqp1_0.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/src/rabbitmq_amqp1_0.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/lib-java/junit.jar b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/lib-java/junit.jar
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/lib-java/junit.jar
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/lib-java/junit.jar

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/proton/Makefile b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/proton/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/proton/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/proton/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/proton/build.xml b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/proton/build.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/proton/build.xml
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/proton/build.xml

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/proton/test/com/rabbitmq/amqp1_0/tests/proton/ProtonTests.java b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/proton/test/com/rabbitmq/amqp1_0/tests/proton/ProtonTests.java
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/proton/test/com/rabbitmq/amqp1_0/tests/proton/ProtonTests.java
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/proton/test/com/rabbitmq/amqp1_0/tests/proton/ProtonTests.java

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/src/rabbit_amqp1_0_test.erl b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/src/rabbit_amqp1_0_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/src/rabbit_amqp1_0_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/src/rabbit_amqp1_0_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/Makefile b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/build.xml b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/build.xml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/build.xml
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/build.xml

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/run-tests.sh b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/run-tests.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/run-tests.sh
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/run-tests.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/test/com/rabbitmq/amqp1_0/tests/swiftmq/SwiftMQTests.java b/rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/test/com/rabbitmq/amqp1_0/tests/swiftmq/SwiftMQTests.java
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-amqp1.0/test/swiftmq/test/com/rabbitmq/amqp1_0/tests/swiftmq/SwiftMQTests.java
rename to rabbitmq-server/plugins-src/rabbitmq-amqp1.0/test/swiftmq/test/com/rabbitmq/amqp1_0/tests/swiftmq/SwiftMQTests.java

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/Makefile b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/README b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/README
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/README-authorisation b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/README-authorisation
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/README-authorisation
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/README-authorisation

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/README-tests b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/README-tests
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/README-tests
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/README-tests

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/etc/rabbit-test.config b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/etc/rabbit-test.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/etc/rabbit-test.config
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/etc/rabbit-test.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/README b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/README
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/global.ldif b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/global.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/global.ldif
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/global.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/groups.ldif b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/groups.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/groups.ldif
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/groups.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/people.ldif b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/people.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/people.ldif
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/people.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/rabbit.ldif b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/rabbit.ldif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/rabbit.ldif
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/rabbit.ldif

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/setup.sh b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/setup.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/example/setup.sh
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/example/setup.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/package.mk b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap.erl b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap.erl
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_app.erl b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_util.erl b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbit_auth_backend_ldap_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbitmq_auth_backend_ldap.app.src b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbitmq_auth_backend_ldap.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/src/rabbitmq_auth_backend_ldap.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/src/rabbitmq_auth_backend_ldap.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/test/src/rabbit_auth_backend_ldap_test.erl b/rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/test/src/rabbit_auth_backend_ldap_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-backend-ldap/test/src/rabbit_auth_backend_ldap_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-auth-backend-ldap/test/src/rabbit_auth_backend_ldap_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/Makefile b/rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/README b/rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/README
rename to rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/package.mk b/rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl.erl b/rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl.erl
rename to rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl_app.erl b/rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbit_auth_mechanism_ssl_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbitmq_auth_mechanism_ssl.app.src b/rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbitmq_auth_mechanism_ssl.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbitmq_auth_mechanism_ssl.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-auth-mechanism-ssl/src/rabbitmq_auth_mechanism_ssl.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE-MPL-RabbitMQ b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/Makefile b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/README.md b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/README.md
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/package.mk b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbit_exchange_type_consistent_hash.erl b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbit_exchange_type_consistent_hash.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbit_exchange_type_consistent_hash.erl
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbit_exchange_type_consistent_hash.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbitmq_consistent_hash_exchange.app.src b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbitmq_consistent_hash_exchange.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbitmq_consistent_hash_exchange.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/src/rabbitmq_consistent_hash_exchange.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/test/src/rabbit_exchange_type_consistent_hash_test.erl b/rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/test/src/rabbit_exchange_type_consistent_hash_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-consistent-hash-exchange/test/src/rabbit_exchange_type_consistent_hash_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-consistent-hash-exchange/test/src/rabbit_exchange_type_consistent_hash_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/Makefile b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/Makefile.in b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/Makefile.in
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/Makefile.in
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/Makefile.in

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/README.in b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/README.in
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/README.in
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/README.in

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/common.mk b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/common.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/common.mk
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/common.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/ebin/amqp_client.app.in b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/ebin/amqp_client.app.in
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/ebin/amqp_client.app.in
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/ebin/amqp_client.app.in

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/amqp_client.hrl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/amqp_client.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/amqp_client.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/amqp_client.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/amqp_client_internal.hrl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/amqp_client_internal.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/amqp_client_internal.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/amqp_client_internal.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/amqp_gen_consumer_spec.hrl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/amqp_gen_consumer_spec.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/amqp_gen_consumer_spec.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/amqp_gen_consumer_spec.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/rabbit_routing_prefixes.hrl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/rabbit_routing_prefixes.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/include/rabbit_routing_prefixes.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/include/rabbit_routing_prefixes.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/rabbit_common.app.in b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/rabbit_common.app.in
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/rabbit_common.app.in
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/rabbit_common.app.in

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_auth_mechanisms.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_auth_mechanisms.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_auth_mechanisms.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_auth_mechanisms.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channel.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channel.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channel.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channel.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channel_sup_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channels_manager.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channels_manager.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_channels_manager.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_channels_manager.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_client.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_client.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_client.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_client.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_connection.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_connection.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_connection.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_connection.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_connection_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_connection_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_connection_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_connection_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_connection_type_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_connection_type_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_connection_type_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_connection_type_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_direct_connection.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_direct_connection.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_direct_connection.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_direct_connection.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_direct_consumer.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_direct_consumer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_direct_consumer.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_direct_consumer.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_gen_connection.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_gen_connection.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_gen_connection.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_gen_connection.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_gen_consumer.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_gen_consumer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_gen_consumer.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_gen_consumer.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_main_reader.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_main_reader.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_main_reader.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_main_reader.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_network_connection.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_network_connection.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_network_connection.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_network_connection.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_client.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_client.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_client.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_client.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_server.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_server.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_server.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_rpc_server.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_selective_consumer.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_selective_consumer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_selective_consumer.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_selective_consumer.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_uri.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_uri.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/amqp_uri.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/amqp_uri.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/overview.edoc.in b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/overview.edoc.in
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/overview.edoc.in
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/overview.edoc.in

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/rabbit_routing_util.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/rabbit_routing_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/rabbit_routing_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/rabbit_routing_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/uri_parser.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/uri_parser.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/src/uri_parser.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/src/uri_parser.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test.mk b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/test.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test.mk
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/test.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/Makefile b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/amqp_client_SUITE.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/amqp_client_SUITE.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/amqp_client_SUITE.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/amqp_client_SUITE.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/amqp_dbg.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/amqp_dbg.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/amqp_dbg.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/amqp_dbg.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/negative_test_util.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/negative_test_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/negative_test_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/negative_test_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/test_util.erl b/rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/test_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-erlang-client/test/test_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-erlang-client/test/test_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-federation-management/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/Makefile b/rabbitmq-server/plugins-src/rabbitmq-federation-management/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/README b/rabbitmq-server/plugins-src/rabbitmq-federation-management/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/README
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/package.mk b/rabbitmq-server/plugins-src/rabbitmq-federation-management/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/federation.js b/rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/federation.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/federation.js
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/federation.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstream.ejs b/rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstream.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstream.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstream.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstreams.ejs b/rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstreams.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstreams.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation-upstreams.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation.ejs b/rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/priv/www/js/tmpl/federation.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/src/rabbit_federation_mgmt.erl b/rabbitmq-server/plugins-src/rabbitmq-federation-management/src/rabbit_federation_mgmt.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/src/rabbit_federation_mgmt.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/src/rabbit_federation_mgmt.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/src/rabbitmq_federation_management.app.src b/rabbitmq-server/plugins-src/rabbitmq-federation-management/src/rabbitmq_federation_management.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation-management/src/rabbitmq_federation_management.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-federation-management/src/rabbitmq_federation_management.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-federation/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-federation/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/Makefile b/rabbitmq-server/plugins-src/rabbitmq-federation/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-federation/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/README b/rabbitmq-server/plugins-src/rabbitmq-federation/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/README
rename to rabbitmq-server/plugins-src/rabbitmq-federation/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/README-hacking b/rabbitmq-server/plugins-src/rabbitmq-federation/README-hacking
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/README-hacking
rename to rabbitmq-server/plugins-src/rabbitmq-federation/README-hacking

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/etc/rabbit-test.sh b/rabbitmq-server/plugins-src/rabbitmq-federation/etc/rabbit-test.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/etc/rabbit-test.sh
rename to rabbitmq-server/plugins-src/rabbitmq-federation/etc/rabbit-test.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/etc/setup-rabbit-test.sh b/rabbitmq-server/plugins-src/rabbitmq-federation/etc/setup-rabbit-test.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/etc/setup-rabbit-test.sh
rename to rabbitmq-server/plugins-src/rabbitmq-federation/etc/setup-rabbit-test.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/include/rabbit_federation.hrl b/rabbitmq-server/plugins-src/rabbitmq-federation/include/rabbit_federation.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/include/rabbit_federation.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/include/rabbit_federation.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/package.mk b/rabbitmq-server/plugins-src/rabbitmq-federation/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-federation/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_app.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_db.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_db.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_db.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_db.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_event.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_event.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_event.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_event.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link_sup_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link_sup_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link_sup_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_exchange_link_sup_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_link_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_link_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_link_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_link_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_link_util.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_link_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_link_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_link_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_parameters.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_parameters.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_parameters.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_parameters.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_queue.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_queue.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_queue.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_queue.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link_sup_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link_sup_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link_sup_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_queue_link_sup_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_status.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_status.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_status.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_status.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream_exchange.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream_exchange.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream_exchange.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_upstream_exchange.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_util.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbit_federation_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbit_federation_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbitmq_federation.app.src b/rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbitmq_federation.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/src/rabbitmq_federation.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-federation/src/rabbitmq_federation.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_exchange_test.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_exchange_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_exchange_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_exchange_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_queue_test.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_queue_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_queue_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_queue_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_test_util.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_test_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_test_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_test_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_unit_test.erl b/rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_unit_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-federation/test/src/rabbit_federation_unit_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-federation/test/src/rabbit_federation_unit_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-management-agent/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/Makefile b/rabbitmq-server/plugins-src/rabbitmq-management-agent/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/package.mk b/rabbitmq-server/plugins-src/rabbitmq-management-agent/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_app.erl b/rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_agent_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_db_handler.erl b/rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_db_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_db_handler.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_db_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_external_stats.erl b/rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_external_stats.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_external_stats.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbit_mgmt_external_stats.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbitmq_management_agent.app.src b/rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbitmq_management_agent.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-agent/src/rabbitmq_management_agent.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-management-agent/src/rabbitmq_management_agent.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/LICENSE b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/LICENSE
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/LICENSE-BSD-glMatrix b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/LICENSE-BSD-glMatrix
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/LICENSE-BSD-glMatrix
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/LICENSE-BSD-glMatrix

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/LICENSE-MPL-RabbitMQ b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/Makefile b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/README b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/README
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/license_info b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/license_info
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/license_info
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/license_info

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/package.mk b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/js/visualiser.js b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/js/visualiser.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/js/visualiser.js
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/js/visualiser.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/index.html b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/index.html
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix-min.js b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix-min.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix-min.js
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix-min.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix.js b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix.js
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/glMatrix.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/main.js b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/main.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/main.js
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/main.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/model.js b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/model.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/model.js
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/model.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/octtree.js b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/octtree.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/octtree.js
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/octtree.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/physics.js b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/physics.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/physics.js
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/priv/www/visualiser/js/physics.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/src/rabbit_mgmt_wm_all.erl b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/src/rabbit_mgmt_wm_all.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/src/rabbit_mgmt_wm_all.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/src/rabbit_mgmt_wm_all.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/src/rabbit_visualiser_mgmt.erl b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/src/rabbit_visualiser_mgmt.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/src/rabbit_visualiser_mgmt.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/src/rabbit_visualiser_mgmt.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/src/rabbitmq_management_visualiser.app.src b/rabbitmq-server/plugins-src/rabbitmq-management-visualiser/src/rabbitmq_management_visualiser.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management-visualiser/src/rabbitmq_management_visualiser.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-management-visualiser/src/rabbitmq_management_visualiser.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-management/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-management/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-APACHE2-ExplorerCanvas b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-APACHE2-ExplorerCanvas
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-APACHE2-ExplorerCanvas
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-APACHE2-ExplorerCanvas

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-BSD-base64js b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-BSD-base64js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-BSD-base64js
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-BSD-base64js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-EJS10 b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-EJS10
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-EJS10
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-EJS10

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-Flot b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-Flot
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-Flot
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-Flot

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-Sammy060 b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-Sammy060
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-Sammy060
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-Sammy060

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-jQuery164 b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-jQuery164
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MIT-jQuery164
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MIT-jQuery164

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MPL-RabbitMQ b/rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/plugins-src/rabbitmq-management/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/Makefile b/rabbitmq-server/plugins-src/rabbitmq-management/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-management/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/README b/rabbitmq-server/plugins-src/rabbitmq-management/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/README
rename to rabbitmq-server/plugins-src/rabbitmq-management/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/bin/rabbitmqadmin b/rabbitmq-server/plugins-src/rabbitmq-management/bin/rabbitmqadmin
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/bin/rabbitmqadmin
rename to rabbitmq-server/plugins-src/rabbitmq-management/bin/rabbitmqadmin

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/etc/bunny.config b/rabbitmq-server/plugins-src/rabbitmq-management/etc/bunny.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/etc/bunny.config
rename to rabbitmq-server/plugins-src/rabbitmq-management/etc/bunny.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/etc/hare.config b/rabbitmq-server/plugins-src/rabbitmq-management/etc/hare.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/etc/hare.config
rename to rabbitmq-server/plugins-src/rabbitmq-management/etc/hare.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/etc/rabbit-test.config b/rabbitmq-server/plugins-src/rabbitmq-management/etc/rabbit-test.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/etc/rabbit-test.config
rename to rabbitmq-server/plugins-src/rabbitmq-management/etc/rabbit-test.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/include/rabbit_mgmt.hrl b/rabbitmq-server/plugins-src/rabbitmq-management/include/rabbit_mgmt.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/include/rabbit_mgmt.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-management/include/rabbit_mgmt.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/include/rabbit_mgmt_test.hrl b/rabbitmq-server/plugins-src/rabbitmq-management/include/rabbit_mgmt_test.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/include/rabbit_mgmt_test.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-management/include/rabbit_mgmt_test.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/license_info b/rabbitmq-server/plugins-src/rabbitmq-management/license_info
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/license_info
rename to rabbitmq-server/plugins-src/rabbitmq-management/license_info

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/package.mk b/rabbitmq-server/plugins-src/rabbitmq-management/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-management/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/api/index.html b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/api/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/api/index.html
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/api/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/cli/index.html b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/cli/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/cli/index.html
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/cli/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/css/evil.css b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/css/evil.css
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/css/evil.css
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/css/evil.css

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/css/main.css b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/css/main.css
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/css/main.css
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/css/main.css

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/doc/stats.html b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/doc/stats.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/doc/stats.html
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/doc/stats.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/favicon.ico b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/favicon.ico
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/favicon.ico
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/favicon.ico

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-green-dark.png b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-green-dark.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-green-dark.png
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-green-dark.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-red-dark.png b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-red-dark.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-red-dark.png
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-red-dark.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-red.png b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-red.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-red.png
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-red.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-yellow-dark.png b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-yellow-dark.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/bg-yellow-dark.png
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/bg-yellow-dark.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/collapse.png b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/collapse.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/collapse.png
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/collapse.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/expand.png b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/expand.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/expand.png
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/expand.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/rabbitmqlogo.png b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/rabbitmqlogo.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/img/rabbitmqlogo.png
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/img/rabbitmqlogo.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/index.html b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/index.html
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/base64.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/base64.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/base64.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/base64.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/charts.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/charts.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/charts.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/charts.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/dispatcher.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/dispatcher.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/dispatcher.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/dispatcher.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/ejs.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/ejs.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/ejs.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/ejs.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/ejs.min.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/ejs.min.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/ejs.min.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/ejs.min.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/excanvas.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/excanvas.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/excanvas.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/excanvas.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/excanvas.min.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/excanvas.min.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/excanvas.min.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/excanvas.min.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/formatters.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/formatters.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/formatters.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/formatters.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/global.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/global.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/global.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/global.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/help.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/help.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/help.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/help.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.min.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.min.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.min.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery-1.6.4.min.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.min.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.min.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.min.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.min.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.min.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.min.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.min.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/jquery.flot.time.min.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/json2.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/json2.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/json2.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/json2.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/main.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/main.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/main.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/main.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/prefs.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/prefs.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/prefs.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/prefs.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.min.js b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.min.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.min.js
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/sammy-0.6.0.min.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/404.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/404.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/404.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/404.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/add-binding.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/add-binding.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/add-binding.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/add-binding.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/bindings.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/bindings.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/bindings.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/bindings.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/channel.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/channel.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/channel.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/channel.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels-list.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels-list.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels-list.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels-list.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/channels.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/cluster-name.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/cluster-name.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/cluster-name.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/cluster-name.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/connection.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/connection.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/connection.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/connection.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/connections.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/connections.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/connections.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/connections.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/consumers.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/consumers.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/consumers.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/consumers.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/error-popup.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/error-popup.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/error-popup.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/error-popup.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchange.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchange.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchange.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchange.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchanges.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchanges.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchanges.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/exchanges.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/import-succeeded.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/import-succeeded.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/import-succeeded.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/import-succeeded.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/layout.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/layout.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/layout.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/layout.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/login.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/login.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/login.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/login.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/memory.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/memory.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/memory.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/memory.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/messages.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/messages.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/messages.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/messages.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-deliveries.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-deliveries.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-deliveries.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-deliveries.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-publishes.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-publishes.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-publishes.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/msg-detail-publishes.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/node.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/node.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/node.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/node.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/overview.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/overview.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/overview.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/overview.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/partition.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/partition.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/partition.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/partition.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/permissions.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/permissions.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/permissions.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/permissions.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/policies.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/policies.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/policies.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/policies.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/policy.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/policy.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/policy.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/policy.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/publish.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/publish.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/publish.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/publish.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/queue.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/queue.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/queue.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/queue.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/queues.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/queues.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/queues.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/queues.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/rate-options.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/rate-options.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/rate-options.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/rate-options.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/registry.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/registry.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/registry.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/registry.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/status.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/status.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/status.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/status.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/user.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/user.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/user.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/user.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/users.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/users.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/users.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/users.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhost.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhost.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhost.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhost.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhosts.ejs b/rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhosts.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhosts.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-management/priv/www/js/tmpl/vhosts.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_app.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_db.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_db.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_db.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_db.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_dispatcher.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_dispatcher.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_dispatcher.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_dispatcher.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_extension.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_extension.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_extension.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_extension.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_format.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_format.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_format.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_format.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_load_definitions.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_load_definitions.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_load_definitions.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_load_definitions.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_stats.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_stats.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_stats.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_stats.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_util.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_aliveness_test.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_aliveness_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_aliveness_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_aliveness_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_binding.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_binding.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_binding.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_binding.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_bindings.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_bindings.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_bindings.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_bindings.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channel.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channel.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channel.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channel.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channels.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channels.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channels.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_channels.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_cluster_name.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_cluster_name.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_cluster_name.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_cluster_name.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection_channels.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection_channels.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection_channels.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connection_channels.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connections.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connections.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connections.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_connections.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_definitions.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_definitions.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_definitions.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_definitions.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange_publish.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange_publish.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange_publish.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchange_publish.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchanges.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchanges.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchanges.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_exchanges.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_extensions.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_extensions.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_extensions.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_extensions.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_node.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_node.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_node.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_node.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_nodes.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_nodes.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_nodes.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_nodes.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_overview.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_overview.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_overview.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_overview.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameter.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameter.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameter.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameter.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameters.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameters.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameters.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_parameters.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permission.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permission.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permission.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permission.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_user.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_user.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_user.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_user.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_vhost.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_vhost.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_vhost.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_permissions_vhost.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policies.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policies.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policies.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policies.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policy.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policy.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policy.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_policy.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_actions.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_actions.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_actions.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_actions.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_get.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_get.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_get.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_get.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_purge.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_purge.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_purge.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queue_purge.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queues.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queues.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queues.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_queues.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_user.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_user.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_user.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_user.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_users.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_users.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_users.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_users.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhost.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhost.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhost.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhost.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhosts.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhosts.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhosts.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_vhosts.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_whoami.erl b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_whoami.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_whoami.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbit_mgmt_wm_whoami.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbitmq_management.app.src b/rabbitmq-server/plugins-src/rabbitmq-management/src/rabbitmq_management.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/src/rabbitmq_management.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-management/src/rabbitmq_management.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/default-config b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/default-config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/default-config
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/default-config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_clustering.erl b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_clustering.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_clustering.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_clustering.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db.erl b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db_unit.erl b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db_unit.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db_unit.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_db_unit.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_http.erl b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_http.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_http.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_http.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_unit.erl b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_unit.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_unit.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_unit.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_util.erl b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbit_mgmt_test_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbitmqadmin-test.py b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbitmqadmin-test.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/rabbitmqadmin-test.py
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/rabbitmqadmin-test.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/test-config b/rabbitmq-server/plugins-src/rabbitmq-management/test/src/test-config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-management/test/src/test-config
rename to rabbitmq-server/plugins-src/rabbitmq-management/test/src/test-config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-mqtt/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/Makefile b/rabbitmq-server/plugins-src/rabbitmq-mqtt/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/README.md b/rabbitmq-server/plugins-src/rabbitmq-mqtt/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/README.md
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt.hrl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt_frame.hrl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt_frame.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt_frame.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/include/rabbit_mqtt_frame.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/lib/junit.jar b/rabbitmq-server/plugins-src/rabbitmq-mqtt/lib/junit.jar
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/lib/junit.jar
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/lib/junit.jar

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/package.mk b/rabbitmq-server/plugins-src/rabbitmq-mqtt/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_collector.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_collector.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_collector.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_collector.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_connection_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_connection_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_connection_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_connection_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_frame.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_frame.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_frame.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_frame.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_processor.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_processor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_processor.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_processor.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_reader.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_reader.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_reader.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_reader.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_util.erl b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbit_mqtt_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbitmq_mqtt.app.src b/rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbitmq_mqtt.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/src/rabbitmq_mqtt.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/src/rabbitmq_mqtt.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/test/Makefile b/rabbitmq-server/plugins-src/rabbitmq-mqtt/test/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/test/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/test/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/test/src/com/rabbitmq/mqtt/test/MqttTest.java b/rabbitmq-server/plugins-src/rabbitmq-mqtt/test/src/com/rabbitmq/mqtt/test/MqttTest.java
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/test/src/com/rabbitmq/mqtt/test/MqttTest.java
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/test/src/com/rabbitmq/mqtt/test/MqttTest.java

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/test/test.sh b/rabbitmq-server/plugins-src/rabbitmq-mqtt/test/test.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-mqtt/test/test.sh
rename to rabbitmq-server/plugins-src/rabbitmq-mqtt/test/test.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/Makefile b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/README b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/README
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/etc/rabbit-test.config b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/etc/rabbit-test.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/etc/rabbit-test.config
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/etc/rabbit-test.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/package.mk b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/shovel.js b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/shovel.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/shovel.js
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/shovel.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovel.ejs b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovel.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovel.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovel.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovels.ejs b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovels.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovels.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/dynamic-shovels.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/shovels.ejs b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/shovels.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/shovels.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/priv/www/js/tmpl/shovels.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/src/rabbit_shovel_mgmt.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/src/rabbit_shovel_mgmt.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/src/rabbit_shovel_mgmt.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/src/rabbit_shovel_mgmt.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/src/rabbitmq_shovel_management.app.src b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/src/rabbitmq_shovel_management.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/src/rabbitmq_shovel_management.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/src/rabbitmq_shovel_management.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_all.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_all.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_all.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_all.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_http.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_http.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_http.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel-management/test/src/rabbit_shovel_mgmt_test_http.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-shovel/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/Makefile b/rabbitmq-server/plugins-src/rabbitmq-shovel/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/README b/rabbitmq-server/plugins-src/rabbitmq-shovel/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/README
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/generate_deps b/rabbitmq-server/plugins-src/rabbitmq-shovel/generate_deps
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/generate_deps
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/generate_deps

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/include/rabbit_shovel.hrl b/rabbitmq-server/plugins-src/rabbitmq-shovel/include/rabbit_shovel.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/include/rabbit_shovel.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/include/rabbit_shovel.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/package.mk b/rabbitmq-server/plugins-src/rabbitmq-shovel/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_config.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_config.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_config.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_config.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_parameters.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_parameters.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_parameters.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_parameters.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_status.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_status.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_status.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_status.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbit_shovel_worker_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbitmq_shovel.app.src b/rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbitmq_shovel.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/src/rabbitmq_shovel.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/src/rabbitmq_shovel.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_all.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_all.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_all.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_all.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_dyn.erl b/rabbitmq-server/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_dyn.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_dyn.erl
rename to rabbitmq-server/plugins-src/rabbitmq-shovel/test/src/rabbit_shovel_test_dyn.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-stomp/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/Makefile b/rabbitmq-server/plugins-src/rabbitmq-stomp/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/NOTES b/rabbitmq-server/plugins-src/rabbitmq-stomp/NOTES
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/NOTES
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/NOTES

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/README.md b/rabbitmq-server/plugins-src/rabbitmq-stomp/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/README.md
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/deps/stomppy/Makefile b/rabbitmq-server/plugins-src/rabbitmq-stomp/deps/stomppy/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/deps/stomppy/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/deps/stomppy/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/deps/stomppy/rabbit.patch b/rabbitmq-server/plugins-src/rabbitmq-stomp/deps/stomppy/rabbit.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/deps/stomppy/rabbit.patch
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/deps/stomppy/rabbit.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_recv.pl b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_recv.pl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_recv.pl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_recv.pl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_client.pl b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_client.pl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_client.pl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_client.pl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_service.pl b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_service.pl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_service.pl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_rpc_service.pl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send.pl b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send.pl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send.pl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send.pl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send_many.pl b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send_many.pl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send_many.pl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_send_many.pl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_slow_recv.pl b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_slow_recv.pl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_slow_recv.pl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/perl/rabbitmq_stomp_slow_recv.pl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/cb-receiver.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/cb-receiver.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/cb-receiver.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/cb-receiver.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/cb-sender.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/cb-sender.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/cb-sender.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/cb-sender.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/cb-slow-receiver.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/cb-slow-receiver.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/cb-slow-receiver.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/cb-slow-receiver.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/persistent-receiver.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/persistent-receiver.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/persistent-receiver.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/persistent-receiver.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/persistent-sender.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/persistent-sender.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/persistent-sender.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/persistent-sender.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-receiver.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-receiver.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-receiver.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-receiver.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-with-unsubscribe.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-with-unsubscribe.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-with-unsubscribe.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/topic-broadcast-with-unsubscribe.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/topic-sender.rb b/rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/topic-sender.rb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/examples/ruby/topic-sender.rb
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/examples/ruby/topic-sender.rb

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/include/rabbit_stomp.hrl b/rabbitmq-server/plugins-src/rabbitmq-stomp/include/rabbit_stomp.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/include/rabbit_stomp.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/include/rabbit_stomp.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/include/rabbit_stomp_frame.hrl b/rabbitmq-server/plugins-src/rabbitmq-stomp/include/rabbit_stomp_frame.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/include/rabbit_stomp_frame.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/include/rabbit_stomp_frame.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/include/rabbit_stomp_headers.hrl b/rabbitmq-server/plugins-src/rabbitmq-stomp/include/rabbit_stomp_headers.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/include/rabbit_stomp_headers.hrl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/include/rabbit_stomp_headers.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/package.mk b/rabbitmq-server/plugins-src/rabbitmq-stomp/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_client_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_client_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_client_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_client_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_frame.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_frame.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_frame.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_frame.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_processor.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_processor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_processor.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_processor.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_reader.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_reader.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_reader.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_reader.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_util.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbit_stomp_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbit_stomp_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbitmq_stomp.app.src b/rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbitmq_stomp.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/src/rabbitmq_stomp.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/src/rabbitmq_stomp.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/ack.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/ack.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/ack.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/ack.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/base.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/base.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/base.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/base.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/connect_options.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/connect_options.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/connect_options.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/connect_options.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/destinations.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/destinations.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/destinations.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/destinations.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/errors.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/errors.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/errors.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/errors.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/lifecycle.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/lifecycle.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/lifecycle.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/lifecycle.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/non_ssl.config b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/non_ssl.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/non_ssl.config
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/non_ssl.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/parsing.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/parsing.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/parsing.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/parsing.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_amqqueue_test.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_amqqueue_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_amqqueue_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_amqqueue_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_client.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_client.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_client.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_client.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_publish_test.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_publish_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_publish_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_publish_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_frame.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_frame.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_frame.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_frame.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_util.erl b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/rabbit_stomp_test_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/reliability.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/reliability.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/reliability.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/reliability.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/ssl.config b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/ssl.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/ssl.config
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/ssl.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/ssl_lifecycle.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/ssl_lifecycle.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/ssl_lifecycle.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/ssl_lifecycle.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_connect_options.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_connect_options.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_connect_options.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_connect_options.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_runner.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_runner.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_runner.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_runner.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_ssl.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_ssl.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_ssl.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_ssl.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_util.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_util.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/test_util.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/test_util.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/transactions.py b/rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/transactions.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-stomp/test/src/transactions.py
rename to rabbitmq-server/plugins-src/rabbitmq-stomp/test/src/transactions.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-test/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-test/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/Makefile b/rabbitmq-server/plugins-src/rabbitmq-test/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-test/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/README b/rabbitmq-server/plugins-src/rabbitmq-test/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/README
rename to rabbitmq-server/plugins-src/rabbitmq-test/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/certs/Makefile b/rabbitmq-server/plugins-src/rabbitmq-test/certs/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/certs/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-test/certs/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/certs/openssl.cnf b/rabbitmq-server/plugins-src/rabbitmq-test/certs/openssl.cnf
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/certs/openssl.cnf
rename to rabbitmq-server/plugins-src/rabbitmq-test/certs/openssl.cnf

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/package.mk b/rabbitmq-server/plugins-src/rabbitmq-test/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-test/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/qpid_config.py b/rabbitmq-server/plugins-src/rabbitmq-test/qpid_config.py
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/qpid_config.py
rename to rabbitmq-server/plugins-src/rabbitmq-test/qpid_config.py

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/qpid_patch b/rabbitmq-server/plugins-src/rabbitmq-test/qpid_patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/qpid_patch
rename to rabbitmq-server/plugins-src/rabbitmq-test/qpid_patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/rabbit_failing.txt b/rabbitmq-server/plugins-src/rabbitmq-test/rabbit_failing.txt
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/rabbit_failing.txt
rename to rabbitmq-server/plugins-src/rabbitmq-test/rabbit_failing.txt

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/inet_proxy_dist.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/inet_proxy_dist.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/inet_proxy_dist.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/inet_proxy_dist.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/inet_tcp_proxy.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/inet_tcp_proxy.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/inet_tcp_proxy.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/inet_tcp_proxy.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/inet_tcp_proxy_manager.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/inet_tcp_proxy_manager.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/inet_tcp_proxy_manager.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/inet_tcp_proxy_manager.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_ha_test_consumer.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_ha_test_consumer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_ha_test_consumer.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_ha_test_consumer.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_ha_test_producer.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_ha_test_producer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_ha_test_producer.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_ha_test_producer.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_test_configs.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_test_configs.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_test_configs.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_test_configs.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_test_runner.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_test_runner.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_test_runner.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_test_runner.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_test_util.erl b/rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_test_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbit_test_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/rabbit_test_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbitmq_test.app.src b/rabbitmq-server/plugins-src/rabbitmq-test/src/rabbitmq_test.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/src/rabbitmq_test.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-test/src/rabbitmq_test.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/clustering_management.erl b/rabbitmq-server/plugins-src/rabbitmq-test/test/src/clustering_management.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/clustering_management.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/test/src/clustering_management.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/dynamic_ha.erl b/rabbitmq-server/plugins-src/rabbitmq-test/test/src/dynamic_ha.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/dynamic_ha.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/test/src/dynamic_ha.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/eager_sync.erl b/rabbitmq-server/plugins-src/rabbitmq-test/test/src/eager_sync.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/eager_sync.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/test/src/eager_sync.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/many_node_ha.erl b/rabbitmq-server/plugins-src/rabbitmq-test/test/src/many_node_ha.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/many_node_ha.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/test/src/many_node_ha.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/partitions.erl b/rabbitmq-server/plugins-src/rabbitmq-test/test/src/partitions.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/partitions.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/test/src/partitions.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/simple_ha.erl b/rabbitmq-server/plugins-src/rabbitmq-test/test/src/simple_ha.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/simple_ha.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/test/src/simple_ha.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/sync_detection.erl b/rabbitmq-server/plugins-src/rabbitmq-test/test/src/sync_detection.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-test/test/src/sync_detection.erl
rename to rabbitmq-server/plugins-src/rabbitmq-test/test/src/sync_detection.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-tracing/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/Makefile b/rabbitmq-server/plugins-src/rabbitmq-tracing/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/README b/rabbitmq-server/plugins-src/rabbitmq-tracing/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/README
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/package.mk b/rabbitmq-server/plugins-src/rabbitmq-tracing/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/priv/www/js/tmpl/traces.ejs b/rabbitmq-server/plugins-src/rabbitmq-tracing/priv/www/js/tmpl/traces.ejs
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/priv/www/js/tmpl/traces.ejs
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/priv/www/js/tmpl/traces.ejs

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/priv/www/js/tracing.js b/rabbitmq-server/plugins-src/rabbitmq-tracing/priv/www/js/tracing.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/priv/www/js/tracing.js
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/priv/www/js/tracing.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_app.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_consumer_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_files.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_files.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_files.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_files.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_mgmt.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_mgmt.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_mgmt.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_mgmt.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_traces.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_traces.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_traces.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_traces.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_file.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_file.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_file.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_file.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_files.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_files.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_files.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_files.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_trace.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_trace.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_trace.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_trace.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_traces.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_traces.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_traces.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbit_tracing_wm_traces.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbitmq_tracing.app.src b/rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbitmq_tracing.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/src/rabbitmq_tracing.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/src/rabbitmq_tracing.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/test/src/rabbit_tracing_test.erl b/rabbitmq-server/plugins-src/rabbitmq-tracing/test/src/rabbit_tracing_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-tracing/test/src/rabbit_tracing_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-tracing/test/src/rabbit_tracing_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/LICENSE b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/LICENSE
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/Makefile b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/README.md b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/README.md
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/package.mk b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_app.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_registry.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_registry.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_registry.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_registry.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_util.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_util.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_web_dispatch_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_webmachine.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_webmachine.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbit_webmachine.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbit_webmachine.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbitmq_web_dispatch.app.src b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbitmq_web_dispatch.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/src/rabbitmq_web_dispatch.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/src/rabbitmq_web_dispatch.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/test/priv/www/index.html b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/test/priv/www/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/test/priv/www/index.html
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/test/priv/www/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test_unit.erl b/rabbitmq-server/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test_unit.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test_unit.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-dispatch/test/src/rabbit_web_dispatch_test_unit.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/LICENSE b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/LICENSE
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/LICENSE-APL2-Stomp-Websocket b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/LICENSE-APL2-Stomp-Websocket
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/LICENSE-APL2-Stomp-Websocket
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/LICENSE-APL2-Stomp-Websocket

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/LICENSE-MPL-RabbitMQ b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/Makefile b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/README.md b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/README.md
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/package.mk b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.html b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.html
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.png b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.png
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/bunny.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/echo.html b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/echo.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/echo.html
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/echo.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/index.html b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/index.html
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/main.css b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/main.css
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/main.css
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/main.css

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/pencil.cur b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/pencil.cur
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/pencil.cur
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/pencil.cur

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/stomp.js b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/stomp.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/stomp.js
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/stomp.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/temp-queue.html b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/temp-queue.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/priv/temp-queue.html
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/priv/temp-queue.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/src/rabbit_web_stomp_examples_app.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/src/rabbit_web_stomp_examples_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/src/rabbit_web_stomp_examples_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/src/rabbit_web_stomp_examples_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/src/rabbitmq_web_stomp_examples.app.src b/rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/src/rabbitmq_web_stomp_examples.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp-examples/src/rabbitmq_web_stomp_examples.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp-examples/src/rabbitmq_web_stomp_examples.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/.srcdist_done b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/.srcdist_done
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/LICENSE b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/LICENSE
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/LICENSE-MPL-RabbitMQ b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/LICENSE-MPL-RabbitMQ
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/LICENSE-MPL-RabbitMQ
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/LICENSE-MPL-RabbitMQ

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/Makefile b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/Makefile
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/README.md b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/README.md
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/package.mk b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/package.mk
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_app.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_app.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_client_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sockjs.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sockjs.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sockjs.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sockjs.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sup.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sup.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbit_ws_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbitmq_web_stomp.app.src b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbitmq_web_stomp.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/src/rabbitmq_web_stomp.app.src
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/src/rabbitmq_web_stomp.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_all.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_all.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_all.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_all.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_raw_websocket.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_raw_websocket.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_raw_websocket.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_raw_websocket.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_sockjs_websocket.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_sockjs_websocket.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_sockjs_websocket.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rabbit_ws_test_sockjs_websocket.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rfc6455_client.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rfc6455_client.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/rfc6455_client.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/rfc6455_client.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/stomp.erl b/rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/stomp.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/rabbitmq-web-stomp/test/src/stomp.erl
rename to rabbitmq-server/plugins-src/rabbitmq-web-stomp/test/src/stomp.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/release.mk b/rabbitmq-server/plugins-src/release.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/release.mk
rename to rabbitmq-server/plugins-src/release.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/.srcdist_done b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/.srcdist_done
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0000-remove-spec-patch.diff b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0000-remove-spec-patch.diff
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0000-remove-spec-patch.diff
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0000-remove-spec-patch.diff

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0001-a2b-b2a.diff b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0001-a2b-b2a.diff
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0001-a2b-b2a.diff
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0001-a2b-b2a.diff

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0002-parameterised-modules-r16a.diff b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0002-parameterised-modules-r16a.diff
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0002-parameterised-modules-r16a.diff
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0002-parameterised-modules-r16a.diff

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0003-websocket-subprotocol b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0003-websocket-subprotocol
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/0003-websocket-subprotocol
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/0003-websocket-subprotocol

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/Makefile b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/Makefile
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/generate-0000-remove-spec-patch.sh b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/generate-0000-remove-spec-patch.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/generate-0000-remove-spec-patch.sh
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/generate-0000-remove-spec-patch.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/hash.mk b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/hash.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/hash.mk
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/hash.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/package.mk b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/package.mk
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/.done b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/.done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/.done
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/.done

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/COPYING b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/COPYING
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/COPYING
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/COPYING

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Changelog b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Changelog
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Changelog
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Changelog

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-APL2-Rebar b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-APL2-Rebar
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-APL2-Rebar
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-APL2-Rebar

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-Mochiweb b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-Mochiweb
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-Mochiweb
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-Mochiweb

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-SockJS b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-SockJS
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-SockJS
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/LICENSE-MIT-SockJS

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Makefile b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Makefile
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/README.md b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/README.md
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/README.md
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/README.md

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_echo.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_echo.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_echo.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_echo.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_test_server.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_test_server.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_test_server.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/cowboy_test_server.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/echo.html b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/echo.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/echo.html
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/echo.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/cowboy_multiplex.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/cowboy_multiplex.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/cowboy_multiplex.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/cowboy_multiplex.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/index.html b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/index.html
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/multiplex.js b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/multiplex.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/multiplex.js
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/examples/multiplex/multiplex.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar.config b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar.config
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/rebar.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochijson2_fork.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochijson2_fork.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochijson2_fork.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochijson2_fork.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochinum_fork.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochinum_fork.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochinum_fork.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/mochinum_fork.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/pmod_pt.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/pmod_pt.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/pmod_pt.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/pmod_pt.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.app.src b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.app.src
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_action.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_action.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_action.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_action.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_app.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_app.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_cowboy_handler.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_cowboy_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_cowboy_handler.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_cowboy_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_filters.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_filters.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_filters.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_filters.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_handler.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_handler.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_http.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_http.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_http.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_http.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_internal.hrl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_internal.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_internal.hrl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_internal.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_json.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_json.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_json.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_json.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex_channel.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex_channel.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex_channel.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_multiplex_channel.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_service.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_service.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_service.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_service.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session_sup.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session_sup.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_session_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_util.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_util.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_ws_handler.erl b/rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_ws_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_ws_handler.erl
rename to rabbitmq-server/plugins-src/sockjs-erlang-wrapper/sockjs-erlang-git/src/sockjs_ws_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/umbrella.mk b/rabbitmq-server/plugins-src/umbrella.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/umbrella.mk
rename to rabbitmq-server/plugins-src/umbrella.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/.srcdist_done b/rabbitmq-server/plugins-src/webmachine-wrapper/.srcdist_done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/.srcdist_done
rename to rabbitmq-server/plugins-src/webmachine-wrapper/.srcdist_done

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/10-remove-crypto-dependency.patch b/rabbitmq-server/plugins-src/webmachine-wrapper/10-remove-crypto-dependency.patch
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/10-remove-crypto-dependency.patch
rename to rabbitmq-server/plugins-src/webmachine-wrapper/10-remove-crypto-dependency.patch

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/LICENSE-Apache-Basho b/rabbitmq-server/plugins-src/webmachine-wrapper/LICENSE-Apache-Basho
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/LICENSE-Apache-Basho
rename to rabbitmq-server/plugins-src/webmachine-wrapper/LICENSE-Apache-Basho

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/Makefile b/rabbitmq-server/plugins-src/webmachine-wrapper/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/Makefile
rename to rabbitmq-server/plugins-src/webmachine-wrapper/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/hash.mk b/rabbitmq-server/plugins-src/webmachine-wrapper/hash.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/hash.mk
rename to rabbitmq-server/plugins-src/webmachine-wrapper/hash.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/license_info b/rabbitmq-server/plugins-src/webmachine-wrapper/license_info
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/license_info
rename to rabbitmq-server/plugins-src/webmachine-wrapper/license_info

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/package.mk b/rabbitmq-server/plugins-src/webmachine-wrapper/package.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/package.mk
rename to rabbitmq-server/plugins-src/webmachine-wrapper/package.mk

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/.done b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/.done
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/.done
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/.done

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/.travis.yml b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/.travis.yml
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/.travis.yml
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/.travis.yml

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/Emakefile b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/Emakefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/Emakefile
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/Emakefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/LICENSE b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/LICENSE
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/LICENSE
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/LICENSE

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/Makefile b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/Makefile
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/README.org b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/README.org
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/README.org
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/README.org

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/THANKS b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/THANKS
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/THANKS
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/THANKS

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/Makefile b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/Makefile
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/README b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/README
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/priv/dispatch.conf b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/priv/dispatch.conf
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/priv/dispatch.conf
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/priv/dispatch.conf

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/rebar.config b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/rebar.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/rebar.config
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/rebar.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.app.src b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.app.src
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_app.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_app.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_fs_resource.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_fs_resource.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_fs_resource.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_fs_resource.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_resource.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_resource.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_resource.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_resource.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_sup.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_sup.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/src/webmachine_demo_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/start.sh b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/start.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/demo/start.sh
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/demo/start.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/docs/http-headers-status-v3.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/docs/http-headers-status-v3.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/docs/http-headers-status-v3.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/docs/http-headers-status-v3.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine.hrl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine.hrl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine_logger.hrl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine_logger.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine_logger.hrl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/webmachine_logger.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqdata.hrl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqdata.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqdata.hrl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqdata.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqstate.hrl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqstate.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqstate.hrl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/wm_reqstate.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/wm_resource.hrl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/wm_resource.hrl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/include/wm_resource.hrl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/include/wm_resource.hrl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/Makefile b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/Makefile
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/Makefile
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/Makefile

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/README b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/README
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/README
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/README

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/priv/dispatch.conf b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/priv/dispatch.conf
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/priv/dispatch.conf
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/priv/dispatch.conf

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/rebar.config b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/rebar.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/rebar.config
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/rebar.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.app.src b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.app.src
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_app.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_app.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_resource.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_resource.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_resource.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_resource.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_sup.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_sup.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/src/wmskel_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/start.sh b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/start.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/start.sh
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/start.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/wmskel.template b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/wmskel.template
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/wmskel.template
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/templates/wmskel.template

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/http-headers-status-v3.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/http-headers-status-v3.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/http-headers-status-v3.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/http-headers-status-v3.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.css b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.css
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.css
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.css

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.js b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.js
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.js
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/trace/wmtrace.js

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/www/index.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/www/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/priv/www/index.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/priv/www/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/rebar b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/rebar
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/rebar
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/rebar

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/rebar.config b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/rebar.config
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/rebar.config
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/rebar.config

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/rebar.config.script b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/rebar.config.script
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/rebar.config.script
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/rebar.config.script

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/scripts/new_webmachine.sh b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/scripts/new_webmachine.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/scripts/new_webmachine.sh
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/scripts/new_webmachine.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.app.src b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.app.src
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.app.src
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.app.src

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_app.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_app.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_app.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_app.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_decision_core.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_decision_core.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_decision_core.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_decision_core.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_deps.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_deps.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_deps.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_deps.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_dispatcher.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_dispatcher.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_dispatcher.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_dispatcher.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error_handler.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error_handler.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_error_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log_handler.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log_handler.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_log_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher_sup.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher_sup.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_logger_watcher_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_mochiweb.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_mochiweb.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_mochiweb.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_mochiweb.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_multipart.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_multipart.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_multipart.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_multipart.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_perf_log_handler.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_perf_log_handler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_perf_log_handler.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_perf_log_handler.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_request.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_request.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_request.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_request.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_resource.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_resource.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_resource.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_resource.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_router.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_router.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_router.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_router.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_sup.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_sup.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_sup.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_util.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_util.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_util.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/webmachine_util.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/wmtrace_resource.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/wmtrace_resource.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/wmtrace_resource.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/wmtrace_resource.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/wrq.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/wrq.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/src/wrq.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/src/wrq.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/start-dev.sh b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/start-dev.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/start-dev.sh
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/start-dev.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/start.sh b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/start.sh
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/start.sh
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/start.sh

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/test/etag_test.erl b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/test/etag_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/test/etag_test.erl
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/test/etag_test.erl

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/blogs.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/blogs.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/blogs.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/blogs.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/contact.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/contact.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/contact.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/contact.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/css/style-1c.css b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/css/style-1c.css
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/css/style-1c.css
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/css/style-1c.css

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/css/style.css b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/css/style.css
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/css/style.css
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/css/style.css

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/debugging.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/debugging.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/debugging.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/debugging.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/diagram.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/diagram.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/diagram.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/diagram.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/dispatcher.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/dispatcher.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/dispatcher.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/dispatcher.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/docs.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/docs.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/docs.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/docs.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/example_resources.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/example_resources.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/example_resources.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/example_resources.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/favicon.ico b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/favicon.ico
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/favicon.ico
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/favicon.ico

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/WM200-crop.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/WM200-crop.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/WM200-crop.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/WM200-crop.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basho-landscape.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basho-landscape.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basho-landscape.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basho-landscape.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-decision-tab.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-decision-tab.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-decision-tab.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-decision-tab.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-labeled.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-labeled.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-labeled.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-labeled.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-request-tab.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-request-tab.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-request-tab.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-request-tab.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-response-tab.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-response-tab.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-response-tab.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/basic-trace-response-tab.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/bg.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/bg.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/bg.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/bg.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/blankbox.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/blankbox.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/blankbox.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/blankbox.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/chash.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/chash.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/chash.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/chash.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/easy-ops.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/easy-ops.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/easy-ops.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/easy-ops.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/gossip4.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/gossip4.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/gossip4.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/gossip4.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/halfblankbox.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/halfblankbox.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/halfblankbox.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/halfblankbox.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/http-headers-status-v3.png b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/http-headers-status-v3.png
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/http-headers-status-v3.png
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/http-headers-status-v3.png

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/more.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/more.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/more.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/more.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/site.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/site.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/site.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/site.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/splash250.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/splash250.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/splash250.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/splash250.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/vclock.gif b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/vclock.gif
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/images/vclock.gif
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/images/vclock.gif

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/index.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/index.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/index.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/index.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/intros.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/intros.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/intros.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/intros.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/mechanics.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/mechanics.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/mechanics.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/mechanics.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/quickstart.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/quickstart.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/quickstart.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/quickstart.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/reftrans.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/reftrans.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/reftrans.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/reftrans.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/reqdata.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/reqdata.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/reqdata.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/reqdata.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/resources.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/resources.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/resources.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/resources.html

diff --git a/rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/streambody.html b/rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/streambody.html
similarity index 100%
rename from rabbitmq-server-3.3.5/plugins-src/webmachine-wrapper/webmachine-git/www/streambody.html
rename to rabbitmq-server/plugins-src/webmachine-wrapper/webmachine-git/www/streambody.html

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-defaults b/rabbitmq-server/scripts/rabbitmq-defaults
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-defaults
rename to rabbitmq-server/scripts/rabbitmq-defaults

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-echopid.bat b/rabbitmq-server/scripts/rabbitmq-echopid.bat
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-echopid.bat
rename to rabbitmq-server/scripts/rabbitmq-echopid.bat

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-env b/rabbitmq-server/scripts/rabbitmq-env
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-env
rename to rabbitmq-server/scripts/rabbitmq-env

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-plugins b/rabbitmq-server/scripts/rabbitmq-plugins
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-plugins
rename to rabbitmq-server/scripts/rabbitmq-plugins

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-plugins.bat b/rabbitmq-server/scripts/rabbitmq-plugins.bat
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-plugins.bat
rename to rabbitmq-server/scripts/rabbitmq-plugins.bat

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-server b/rabbitmq-server/scripts/rabbitmq-server
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-server
rename to rabbitmq-server/scripts/rabbitmq-server

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-server.bat b/rabbitmq-server/scripts/rabbitmq-server.bat
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-server.bat
rename to rabbitmq-server/scripts/rabbitmq-server.bat

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmq-service.bat b/rabbitmq-server/scripts/rabbitmq-service.bat
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmq-service.bat
rename to rabbitmq-server/scripts/rabbitmq-service.bat

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmqctl b/rabbitmq-server/scripts/rabbitmqctl
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmqctl
rename to rabbitmq-server/scripts/rabbitmqctl

diff --git a/rabbitmq-server-3.3.5/scripts/rabbitmqctl.bat b/rabbitmq-server/scripts/rabbitmqctl.bat
similarity index 100%
rename from rabbitmq-server-3.3.5/scripts/rabbitmqctl.bat
rename to rabbitmq-server/scripts/rabbitmqctl.bat

diff --git a/rabbitmq-server-3.3.5/src/app_utils.erl b/rabbitmq-server/src/app_utils.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/app_utils.erl
rename to rabbitmq-server/src/app_utils.erl

diff --git a/rabbitmq-server-3.3.5/src/background_gc.erl b/rabbitmq-server/src/background_gc.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/background_gc.erl
rename to rabbitmq-server/src/background_gc.erl

diff --git a/rabbitmq-server-3.3.5/src/credit_flow.erl b/rabbitmq-server/src/credit_flow.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/credit_flow.erl
rename to rabbitmq-server/src/credit_flow.erl

diff --git a/rabbitmq-server-3.3.5/src/delegate.erl b/rabbitmq-server/src/delegate.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/delegate.erl
rename to rabbitmq-server/src/delegate.erl

diff --git a/rabbitmq-server-3.3.5/src/delegate_sup.erl b/rabbitmq-server/src/delegate_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/delegate_sup.erl
rename to rabbitmq-server/src/delegate_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/dtree.erl b/rabbitmq-server/src/dtree.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/dtree.erl
rename to rabbitmq-server/src/dtree.erl

diff --git a/rabbitmq-server-3.3.5/src/file_handle_cache.erl b/rabbitmq-server/src/file_handle_cache.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/file_handle_cache.erl
rename to rabbitmq-server/src/file_handle_cache.erl

diff --git a/rabbitmq-server-3.3.5/src/gatherer.erl b/rabbitmq-server/src/gatherer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/gatherer.erl
rename to rabbitmq-server/src/gatherer.erl

diff --git a/rabbitmq-server-3.3.5/src/gen_server2.erl b/rabbitmq-server/src/gen_server2.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/gen_server2.erl
rename to rabbitmq-server/src/gen_server2.erl

diff --git a/rabbitmq-server-3.3.5/src/gm.erl b/rabbitmq-server/src/gm.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/gm.erl
rename to rabbitmq-server/src/gm.erl

diff --git a/rabbitmq-server-3.3.5/src/gm_soak_test.erl b/rabbitmq-server/src/gm_soak_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/gm_soak_test.erl
rename to rabbitmq-server/src/gm_soak_test.erl

diff --git a/rabbitmq-server-3.3.5/src/gm_speed_test.erl b/rabbitmq-server/src/gm_speed_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/gm_speed_test.erl
rename to rabbitmq-server/src/gm_speed_test.erl

diff --git a/rabbitmq-server-3.3.5/src/gm_tests.erl b/rabbitmq-server/src/gm_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/gm_tests.erl
rename to rabbitmq-server/src/gm_tests.erl

diff --git a/rabbitmq-server-3.3.5/src/lqueue.erl b/rabbitmq-server/src/lqueue.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/lqueue.erl
rename to rabbitmq-server/src/lqueue.erl

diff --git a/rabbitmq-server-3.3.5/src/mirrored_supervisor.erl b/rabbitmq-server/src/mirrored_supervisor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/mirrored_supervisor.erl
rename to rabbitmq-server/src/mirrored_supervisor.erl

diff --git a/rabbitmq-server-3.3.5/src/mirrored_supervisor_tests.erl b/rabbitmq-server/src/mirrored_supervisor_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/mirrored_supervisor_tests.erl
rename to rabbitmq-server/src/mirrored_supervisor_tests.erl

diff --git a/rabbitmq-server-3.3.5/src/mnesia_sync.erl b/rabbitmq-server/src/mnesia_sync.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/mnesia_sync.erl
rename to rabbitmq-server/src/mnesia_sync.erl

diff --git a/rabbitmq-server-3.3.5/src/mochijson2.erl b/rabbitmq-server/src/mochijson2.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/mochijson2.erl
rename to rabbitmq-server/src/mochijson2.erl

diff --git a/rabbitmq-server-3.3.5/src/mochinum.erl b/rabbitmq-server/src/mochinum.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/mochinum.erl
rename to rabbitmq-server/src/mochinum.erl

diff --git a/rabbitmq-server-3.3.5/src/pg2_fixed.erl b/rabbitmq-server/src/pg2_fixed.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/pg2_fixed.erl
rename to rabbitmq-server/src/pg2_fixed.erl

diff --git a/rabbitmq-server-3.3.5/src/pg_local.erl b/rabbitmq-server/src/pg_local.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/pg_local.erl
rename to rabbitmq-server/src/pg_local.erl

diff --git a/rabbitmq-server-3.3.5/src/pmon.erl b/rabbitmq-server/src/pmon.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/pmon.erl
rename to rabbitmq-server/src/pmon.erl

diff --git a/rabbitmq-server-3.3.5/src/priority_queue.erl b/rabbitmq-server/src/priority_queue.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/priority_queue.erl
rename to rabbitmq-server/src/priority_queue.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit.erl b/rabbitmq-server/src/rabbit.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit.erl
rename to rabbitmq-server/src/rabbit.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_access_control.erl b/rabbitmq-server/src/rabbit_access_control.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_access_control.erl
rename to rabbitmq-server/src/rabbit_access_control.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_alarm.erl b/rabbitmq-server/src/rabbit_alarm.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_alarm.erl
rename to rabbitmq-server/src/rabbit_alarm.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_amqqueue.erl b/rabbitmq-server/src/rabbit_amqqueue.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_amqqueue.erl
rename to rabbitmq-server/src/rabbit_amqqueue.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_amqqueue_process.erl b/rabbitmq-server/src/rabbit_amqqueue_process.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_amqqueue_process.erl
rename to rabbitmq-server/src/rabbit_amqqueue_process.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_amqqueue_sup.erl b/rabbitmq-server/src/rabbit_amqqueue_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_amqqueue_sup.erl
rename to rabbitmq-server/src/rabbit_amqqueue_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_auth_backend.erl b/rabbitmq-server/src/rabbit_auth_backend.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_auth_backend.erl
rename to rabbitmq-server/src/rabbit_auth_backend.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_auth_backend_dummy.erl b/rabbitmq-server/src/rabbit_auth_backend_dummy.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_auth_backend_dummy.erl
rename to rabbitmq-server/src/rabbit_auth_backend_dummy.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_auth_backend_internal.erl b/rabbitmq-server/src/rabbit_auth_backend_internal.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_auth_backend_internal.erl
rename to rabbitmq-server/src/rabbit_auth_backend_internal.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_auth_mechanism.erl b/rabbitmq-server/src/rabbit_auth_mechanism.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_auth_mechanism.erl
rename to rabbitmq-server/src/rabbit_auth_mechanism.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_auth_mechanism_amqplain.erl b/rabbitmq-server/src/rabbit_auth_mechanism_amqplain.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_auth_mechanism_amqplain.erl
rename to rabbitmq-server/src/rabbit_auth_mechanism_amqplain.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_auth_mechanism_cr_demo.erl b/rabbitmq-server/src/rabbit_auth_mechanism_cr_demo.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_auth_mechanism_cr_demo.erl
rename to rabbitmq-server/src/rabbit_auth_mechanism_cr_demo.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_auth_mechanism_plain.erl b/rabbitmq-server/src/rabbit_auth_mechanism_plain.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_auth_mechanism_plain.erl
rename to rabbitmq-server/src/rabbit_auth_mechanism_plain.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_autoheal.erl b/rabbitmq-server/src/rabbit_autoheal.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_autoheal.erl
rename to rabbitmq-server/src/rabbit_autoheal.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_backing_queue.erl b/rabbitmq-server/src/rabbit_backing_queue.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_backing_queue.erl
rename to rabbitmq-server/src/rabbit_backing_queue.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_backing_queue_qc.erl b/rabbitmq-server/src/rabbit_backing_queue_qc.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_backing_queue_qc.erl
rename to rabbitmq-server/src/rabbit_backing_queue_qc.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_basic.erl b/rabbitmq-server/src/rabbit_basic.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_basic.erl
rename to rabbitmq-server/src/rabbit_basic.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_binary_generator.erl b/rabbitmq-server/src/rabbit_binary_generator.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_binary_generator.erl
rename to rabbitmq-server/src/rabbit_binary_generator.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_binary_parser.erl b/rabbitmq-server/src/rabbit_binary_parser.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_binary_parser.erl
rename to rabbitmq-server/src/rabbit_binary_parser.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_binding.erl b/rabbitmq-server/src/rabbit_binding.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_binding.erl
rename to rabbitmq-server/src/rabbit_binding.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_channel.erl b/rabbitmq-server/src/rabbit_channel.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_channel.erl
rename to rabbitmq-server/src/rabbit_channel.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_channel_interceptor.erl b/rabbitmq-server/src/rabbit_channel_interceptor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_channel_interceptor.erl
rename to rabbitmq-server/src/rabbit_channel_interceptor.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_channel_sup.erl b/rabbitmq-server/src/rabbit_channel_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_channel_sup.erl
rename to rabbitmq-server/src/rabbit_channel_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_channel_sup_sup.erl b/rabbitmq-server/src/rabbit_channel_sup_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_channel_sup_sup.erl
rename to rabbitmq-server/src/rabbit_channel_sup_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_client_sup.erl b/rabbitmq-server/src/rabbit_client_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_client_sup.erl
rename to rabbitmq-server/src/rabbit_client_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_command_assembler.erl b/rabbitmq-server/src/rabbit_command_assembler.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_command_assembler.erl
rename to rabbitmq-server/src/rabbit_command_assembler.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_connection_helper_sup.erl b/rabbitmq-server/src/rabbit_connection_helper_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_connection_helper_sup.erl
rename to rabbitmq-server/src/rabbit_connection_helper_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_connection_sup.erl b/rabbitmq-server/src/rabbit_connection_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_connection_sup.erl
rename to rabbitmq-server/src/rabbit_connection_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_control_main.erl b/rabbitmq-server/src/rabbit_control_main.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_control_main.erl
rename to rabbitmq-server/src/rabbit_control_main.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_dead_letter.erl b/rabbitmq-server/src/rabbit_dead_letter.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_dead_letter.erl
rename to rabbitmq-server/src/rabbit_dead_letter.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_diagnostics.erl b/rabbitmq-server/src/rabbit_diagnostics.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_diagnostics.erl
rename to rabbitmq-server/src/rabbit_diagnostics.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_direct.erl b/rabbitmq-server/src/rabbit_direct.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_direct.erl
rename to rabbitmq-server/src/rabbit_direct.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_disk_monitor.erl b/rabbitmq-server/src/rabbit_disk_monitor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_disk_monitor.erl
rename to rabbitmq-server/src/rabbit_disk_monitor.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_error_logger.erl b/rabbitmq-server/src/rabbit_error_logger.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_error_logger.erl
rename to rabbitmq-server/src/rabbit_error_logger.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_error_logger_file_h.erl b/rabbitmq-server/src/rabbit_error_logger_file_h.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_error_logger_file_h.erl
rename to rabbitmq-server/src/rabbit_error_logger_file_h.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_event.erl b/rabbitmq-server/src/rabbit_event.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_event.erl
rename to rabbitmq-server/src/rabbit_event.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange.erl b/rabbitmq-server/src/rabbit_exchange.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange.erl
rename to rabbitmq-server/src/rabbit_exchange.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange_decorator.erl b/rabbitmq-server/src/rabbit_exchange_decorator.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange_decorator.erl
rename to rabbitmq-server/src/rabbit_exchange_decorator.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange_type.erl b/rabbitmq-server/src/rabbit_exchange_type.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange_type.erl
rename to rabbitmq-server/src/rabbit_exchange_type.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange_type_direct.erl b/rabbitmq-server/src/rabbit_exchange_type_direct.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange_type_direct.erl
rename to rabbitmq-server/src/rabbit_exchange_type_direct.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange_type_fanout.erl b/rabbitmq-server/src/rabbit_exchange_type_fanout.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange_type_fanout.erl
rename to rabbitmq-server/src/rabbit_exchange_type_fanout.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange_type_headers.erl b/rabbitmq-server/src/rabbit_exchange_type_headers.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange_type_headers.erl
rename to rabbitmq-server/src/rabbit_exchange_type_headers.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange_type_invalid.erl b/rabbitmq-server/src/rabbit_exchange_type_invalid.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange_type_invalid.erl
rename to rabbitmq-server/src/rabbit_exchange_type_invalid.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_exchange_type_topic.erl b/rabbitmq-server/src/rabbit_exchange_type_topic.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_exchange_type_topic.erl
rename to rabbitmq-server/src/rabbit_exchange_type_topic.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_file.erl b/rabbitmq-server/src/rabbit_file.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_file.erl
rename to rabbitmq-server/src/rabbit_file.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_framing.erl b/rabbitmq-server/src/rabbit_framing.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_framing.erl
rename to rabbitmq-server/src/rabbit_framing.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_guid.erl b/rabbitmq-server/src/rabbit_guid.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_guid.erl
rename to rabbitmq-server/src/rabbit_guid.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_heartbeat.erl b/rabbitmq-server/src/rabbit_heartbeat.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_heartbeat.erl
rename to rabbitmq-server/src/rabbit_heartbeat.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_limiter.erl b/rabbitmq-server/src/rabbit_limiter.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_limiter.erl
rename to rabbitmq-server/src/rabbit_limiter.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_log.erl b/rabbitmq-server/src/rabbit_log.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_log.erl
rename to rabbitmq-server/src/rabbit_log.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_memory_monitor.erl b/rabbitmq-server/src/rabbit_memory_monitor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_memory_monitor.erl
rename to rabbitmq-server/src/rabbit_memory_monitor.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_coordinator.erl b/rabbitmq-server/src/rabbit_mirror_queue_coordinator.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_coordinator.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_coordinator.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_master.erl b/rabbitmq-server/src/rabbit_mirror_queue_master.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_master.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_master.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_misc.erl b/rabbitmq-server/src/rabbit_mirror_queue_misc.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_misc.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_misc.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode.erl b/rabbitmq-server/src/rabbit_mirror_queue_mode.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_mode.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode_all.erl b/rabbitmq-server/src/rabbit_mirror_queue_mode_all.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode_all.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_mode_all.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode_exactly.erl b/rabbitmq-server/src/rabbit_mirror_queue_mode_exactly.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode_exactly.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_mode_exactly.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode_nodes.erl b/rabbitmq-server/src/rabbit_mirror_queue_mode_nodes.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_mode_nodes.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_mode_nodes.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_slave.erl b/rabbitmq-server/src/rabbit_mirror_queue_slave.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_slave.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_slave.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_slave_sup.erl b/rabbitmq-server/src/rabbit_mirror_queue_slave_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_slave_sup.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_slave_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mirror_queue_sync.erl b/rabbitmq-server/src/rabbit_mirror_queue_sync.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mirror_queue_sync.erl
rename to rabbitmq-server/src/rabbit_mirror_queue_sync.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_misc.erl b/rabbitmq-server/src/rabbit_misc.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_misc.erl
rename to rabbitmq-server/src/rabbit_misc.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_mnesia.erl b/rabbitmq-server/src/rabbit_mnesia.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_mnesia.erl
rename to rabbitmq-server/src/rabbit_mnesia.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_msg_file.erl b/rabbitmq-server/src/rabbit_msg_file.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_msg_file.erl
rename to rabbitmq-server/src/rabbit_msg_file.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_msg_store.erl b/rabbitmq-server/src/rabbit_msg_store.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_msg_store.erl
rename to rabbitmq-server/src/rabbit_msg_store.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_msg_store_ets_index.erl b/rabbitmq-server/src/rabbit_msg_store_ets_index.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_msg_store_ets_index.erl
rename to rabbitmq-server/src/rabbit_msg_store_ets_index.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_msg_store_gc.erl b/rabbitmq-server/src/rabbit_msg_store_gc.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_msg_store_gc.erl
rename to rabbitmq-server/src/rabbit_msg_store_gc.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_msg_store_index.erl b/rabbitmq-server/src/rabbit_msg_store_index.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_msg_store_index.erl
rename to rabbitmq-server/src/rabbit_msg_store_index.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_net.erl b/rabbitmq-server/src/rabbit_net.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_net.erl
rename to rabbitmq-server/src/rabbit_net.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_networking.erl b/rabbitmq-server/src/rabbit_networking.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_networking.erl
rename to rabbitmq-server/src/rabbit_networking.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_node_monitor.erl b/rabbitmq-server/src/rabbit_node_monitor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_node_monitor.erl
rename to rabbitmq-server/src/rabbit_node_monitor.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_nodes.erl b/rabbitmq-server/src/rabbit_nodes.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_nodes.erl
rename to rabbitmq-server/src/rabbit_nodes.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_parameter_validation.erl b/rabbitmq-server/src/rabbit_parameter_validation.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_parameter_validation.erl
rename to rabbitmq-server/src/rabbit_parameter_validation.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_plugins.erl b/rabbitmq-server/src/rabbit_plugins.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_plugins.erl
rename to rabbitmq-server/src/rabbit_plugins.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_plugins_main.erl b/rabbitmq-server/src/rabbit_plugins_main.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_plugins_main.erl
rename to rabbitmq-server/src/rabbit_plugins_main.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_policies.erl b/rabbitmq-server/src/rabbit_policies.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_policies.erl
rename to rabbitmq-server/src/rabbit_policies.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_policy.erl b/rabbitmq-server/src/rabbit_policy.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_policy.erl
rename to rabbitmq-server/src/rabbit_policy.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_policy_validator.erl b/rabbitmq-server/src/rabbit_policy_validator.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_policy_validator.erl
rename to rabbitmq-server/src/rabbit_policy_validator.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_prelaunch.erl b/rabbitmq-server/src/rabbit_prelaunch.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_prelaunch.erl
rename to rabbitmq-server/src/rabbit_prelaunch.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_queue_collector.erl b/rabbitmq-server/src/rabbit_queue_collector.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_queue_collector.erl
rename to rabbitmq-server/src/rabbit_queue_collector.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_queue_consumers.erl b/rabbitmq-server/src/rabbit_queue_consumers.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_queue_consumers.erl
rename to rabbitmq-server/src/rabbit_queue_consumers.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_queue_decorator.erl b/rabbitmq-server/src/rabbit_queue_decorator.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_queue_decorator.erl
rename to rabbitmq-server/src/rabbit_queue_decorator.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_queue_index.erl b/rabbitmq-server/src/rabbit_queue_index.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_queue_index.erl
rename to rabbitmq-server/src/rabbit_queue_index.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_reader.erl b/rabbitmq-server/src/rabbit_reader.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_reader.erl
rename to rabbitmq-server/src/rabbit_reader.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_recovery_terms.erl b/rabbitmq-server/src/rabbit_recovery_terms.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_recovery_terms.erl
rename to rabbitmq-server/src/rabbit_recovery_terms.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_registry.erl b/rabbitmq-server/src/rabbit_registry.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_registry.erl
rename to rabbitmq-server/src/rabbit_registry.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_restartable_sup.erl b/rabbitmq-server/src/rabbit_restartable_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_restartable_sup.erl
rename to rabbitmq-server/src/rabbit_restartable_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_router.erl b/rabbitmq-server/src/rabbit_router.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_router.erl
rename to rabbitmq-server/src/rabbit_router.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_runtime_parameter.erl b/rabbitmq-server/src/rabbit_runtime_parameter.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_runtime_parameter.erl
rename to rabbitmq-server/src/rabbit_runtime_parameter.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_runtime_parameters.erl b/rabbitmq-server/src/rabbit_runtime_parameters.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_runtime_parameters.erl
rename to rabbitmq-server/src/rabbit_runtime_parameters.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_runtime_parameters_test.erl b/rabbitmq-server/src/rabbit_runtime_parameters_test.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_runtime_parameters_test.erl
rename to rabbitmq-server/src/rabbit_runtime_parameters_test.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_sasl_report_file_h.erl b/rabbitmq-server/src/rabbit_sasl_report_file_h.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_sasl_report_file_h.erl
rename to rabbitmq-server/src/rabbit_sasl_report_file_h.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_ssl.erl b/rabbitmq-server/src/rabbit_ssl.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_ssl.erl
rename to rabbitmq-server/src/rabbit_ssl.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_sup.erl b/rabbitmq-server/src/rabbit_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_sup.erl
rename to rabbitmq-server/src/rabbit_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_table.erl b/rabbitmq-server/src/rabbit_table.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_table.erl
rename to rabbitmq-server/src/rabbit_table.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_tests.erl b/rabbitmq-server/src/rabbit_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_tests.erl
rename to rabbitmq-server/src/rabbit_tests.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_tests_event_receiver.erl b/rabbitmq-server/src/rabbit_tests_event_receiver.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_tests_event_receiver.erl
rename to rabbitmq-server/src/rabbit_tests_event_receiver.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_trace.erl b/rabbitmq-server/src/rabbit_trace.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_trace.erl
rename to rabbitmq-server/src/rabbit_trace.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_types.erl b/rabbitmq-server/src/rabbit_types.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_types.erl
rename to rabbitmq-server/src/rabbit_types.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_upgrade.erl b/rabbitmq-server/src/rabbit_upgrade.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_upgrade.erl
rename to rabbitmq-server/src/rabbit_upgrade.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_upgrade_functions.erl b/rabbitmq-server/src/rabbit_upgrade_functions.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_upgrade_functions.erl
rename to rabbitmq-server/src/rabbit_upgrade_functions.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_variable_queue.erl b/rabbitmq-server/src/rabbit_variable_queue.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_variable_queue.erl
rename to rabbitmq-server/src/rabbit_variable_queue.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_version.erl b/rabbitmq-server/src/rabbit_version.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_version.erl
rename to rabbitmq-server/src/rabbit_version.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_vhost.erl b/rabbitmq-server/src/rabbit_vhost.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_vhost.erl
rename to rabbitmq-server/src/rabbit_vhost.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_vm.erl b/rabbitmq-server/src/rabbit_vm.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_vm.erl
rename to rabbitmq-server/src/rabbit_vm.erl

diff --git a/rabbitmq-server-3.3.5/src/rabbit_writer.erl b/rabbitmq-server/src/rabbit_writer.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/rabbit_writer.erl
rename to rabbitmq-server/src/rabbit_writer.erl

diff --git a/rabbitmq-server-3.3.5/src/supervised_lifecycle.erl b/rabbitmq-server/src/supervised_lifecycle.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/supervised_lifecycle.erl
rename to rabbitmq-server/src/supervised_lifecycle.erl

diff --git a/rabbitmq-server-3.3.5/src/supervisor2.erl b/rabbitmq-server/src/supervisor2.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/supervisor2.erl
rename to rabbitmq-server/src/supervisor2.erl

diff --git a/rabbitmq-server-3.3.5/src/supervisor2_tests.erl b/rabbitmq-server/src/supervisor2_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/supervisor2_tests.erl
rename to rabbitmq-server/src/supervisor2_tests.erl

diff --git a/rabbitmq-server-3.3.5/src/tcp_acceptor.erl b/rabbitmq-server/src/tcp_acceptor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/tcp_acceptor.erl
rename to rabbitmq-server/src/tcp_acceptor.erl

diff --git a/rabbitmq-server-3.3.5/src/tcp_acceptor_sup.erl b/rabbitmq-server/src/tcp_acceptor_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/tcp_acceptor_sup.erl
rename to rabbitmq-server/src/tcp_acceptor_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/tcp_listener.erl b/rabbitmq-server/src/tcp_listener.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/tcp_listener.erl
rename to rabbitmq-server/src/tcp_listener.erl

diff --git a/rabbitmq-server-3.3.5/src/tcp_listener_sup.erl b/rabbitmq-server/src/tcp_listener_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/tcp_listener_sup.erl
rename to rabbitmq-server/src/tcp_listener_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/test_sup.erl b/rabbitmq-server/src/test_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/test_sup.erl
rename to rabbitmq-server/src/test_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/truncate.erl b/rabbitmq-server/src/truncate.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/truncate.erl
rename to rabbitmq-server/src/truncate.erl

diff --git a/rabbitmq-server-3.3.5/src/vm_memory_monitor.erl b/rabbitmq-server/src/vm_memory_monitor.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/vm_memory_monitor.erl
rename to rabbitmq-server/src/vm_memory_monitor.erl

diff --git a/rabbitmq-server-3.3.5/src/vm_memory_monitor_tests.erl b/rabbitmq-server/src/vm_memory_monitor_tests.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/vm_memory_monitor_tests.erl
rename to rabbitmq-server/src/vm_memory_monitor_tests.erl

diff --git a/rabbitmq-server-3.3.5/src/worker_pool.erl b/rabbitmq-server/src/worker_pool.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/worker_pool.erl
rename to rabbitmq-server/src/worker_pool.erl

diff --git a/rabbitmq-server-3.3.5/src/worker_pool_sup.erl b/rabbitmq-server/src/worker_pool_sup.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/worker_pool_sup.erl
rename to rabbitmq-server/src/worker_pool_sup.erl

diff --git a/rabbitmq-server-3.3.5/src/worker_pool_worker.erl b/rabbitmq-server/src/worker_pool_worker.erl
similarity index 100%
rename from rabbitmq-server-3.3.5/src/worker_pool_worker.erl
rename to rabbitmq-server/src/worker_pool_worker.erl

diff --git a/rabbitmq-server-3.3.5/version.mk b/rabbitmq-server/version.mk
similarity index 100%
rename from rabbitmq-server-3.3.5/version.mk
rename to rabbitmq-server/version.mk