diff --git a/warden3/contrib/connectors/fail2ban/README b/contrib/connectors/fail2ban/README
similarity index 100%
rename from warden3/contrib/connectors/fail2ban/README
rename to contrib/connectors/fail2ban/README
diff --git a/warden3/contrib/connectors/fail2ban/f2ban_spam.sh b/contrib/connectors/fail2ban/f2ban_spam.sh
similarity index 100%
rename from warden3/contrib/connectors/fail2ban/f2ban_spam.sh
rename to contrib/connectors/fail2ban/f2ban_spam.sh
diff --git a/warden3/contrib/connectors/fail2ban/f2ban_ssh.sh b/contrib/connectors/fail2ban/f2ban_ssh.sh
similarity index 100%
rename from warden3/contrib/connectors/fail2ban/f2ban_ssh.sh
rename to contrib/connectors/fail2ban/f2ban_ssh.sh
diff --git a/warden3/contrib/connectors/hp-dio/LICENSE b/contrib/connectors/hp-dio/LICENSE
similarity index 100%
rename from warden3/contrib/connectors/hp-dio/LICENSE
rename to contrib/connectors/hp-dio/LICENSE
diff --git a/warden3/contrib/connectors/hp-dio/README b/contrib/connectors/hp-dio/README
similarity index 100%
rename from warden3/contrib/connectors/hp-dio/README
rename to contrib/connectors/hp-dio/README
diff --git a/warden3/contrib/connectors/hp-dio/warden3-dio-sender.py b/contrib/connectors/hp-dio/warden3-dio-sender.py
similarity index 100%
rename from warden3/contrib/connectors/hp-dio/warden3-dio-sender.py
rename to contrib/connectors/hp-dio/warden3-dio-sender.py
diff --git a/warden3/contrib/connectors/hp-dio/warden_client-dio.cfg b/contrib/connectors/hp-dio/warden_client-dio.cfg
similarity index 100%
rename from warden3/contrib/connectors/hp-dio/warden_client-dio.cfg
rename to contrib/connectors/hp-dio/warden_client-dio.cfg
diff --git a/warden3/contrib/connectors/hp-kippo/LICENSE b/contrib/connectors/hp-kippo/LICENSE
similarity index 100%
rename from warden3/contrib/connectors/hp-kippo/LICENSE
rename to contrib/connectors/hp-kippo/LICENSE
diff --git a/warden3/contrib/connectors/hp-kippo/README b/contrib/connectors/hp-kippo/README
similarity index 100%
rename from warden3/contrib/connectors/hp-kippo/README
rename to contrib/connectors/hp-kippo/README
diff --git a/warden3/contrib/connectors/hp-kippo/warden3-kippo-sender.py b/contrib/connectors/hp-kippo/warden3-kippo-sender.py
similarity index 100%
rename from warden3/contrib/connectors/hp-kippo/warden3-kippo-sender.py
rename to contrib/connectors/hp-kippo/warden3-kippo-sender.py
diff --git a/warden3/contrib/connectors/hp-kippo/warden_client-kippo.cfg b/contrib/connectors/hp-kippo/warden_client-kippo.cfg
similarity index 100%
rename from warden3/contrib/connectors/hp-kippo/warden_client-kippo.cfg
rename to contrib/connectors/hp-kippo/warden_client-kippo.cfg
diff --git a/warden3/contrib/connectors/hp-labrea/README b/contrib/connectors/hp-labrea/README
similarity index 100%
rename from warden3/contrib/connectors/hp-labrea/README
rename to contrib/connectors/hp-labrea/README
diff --git a/warden3/contrib/connectors/hp-labrea/labrea-idea b/contrib/connectors/hp-labrea/labrea-idea
similarity index 100%
rename from warden3/contrib/connectors/hp-labrea/labrea-idea
rename to contrib/connectors/hp-labrea/labrea-idea
diff --git a/warden3/contrib/connectors/hp-labrea/labrea-idea.logrotate b/contrib/connectors/hp-labrea/labrea-idea.logrotate
similarity index 100%
rename from warden3/contrib/connectors/hp-labrea/labrea-idea.logrotate
rename to contrib/connectors/hp-labrea/labrea-idea.logrotate
diff --git a/warden3/contrib/connectors/hp-labrea/labrea-idea.py b/contrib/connectors/hp-labrea/labrea-idea.py
similarity index 100%
rename from warden3/contrib/connectors/hp-labrea/labrea-idea.py
rename to contrib/connectors/hp-labrea/labrea-idea.py
diff --git a/warden3/contrib/connectors/warden_client-rt/LICENSE b/contrib/connectors/warden_client-rt/LICENSE
similarity index 100%
rename from warden3/contrib/connectors/warden_client-rt/LICENSE
rename to contrib/connectors/warden_client-rt/LICENSE
diff --git a/warden3/contrib/connectors/warden_client-rt/README b/contrib/connectors/warden_client-rt/README
similarity index 100%
rename from warden3/contrib/connectors/warden_client-rt/README
rename to contrib/connectors/warden_client-rt/README
diff --git a/warden3/contrib/connectors/warden_client-rt/bittorrent.tpl b/contrib/connectors/warden_client-rt/bittorrent.tpl
similarity index 100%
rename from warden3/contrib/connectors/warden_client-rt/bittorrent.tpl
rename to contrib/connectors/warden_client-rt/bittorrent.tpl
diff --git a/warden3/contrib/connectors/warden_client-rt/warden_client-rt.cfg b/contrib/connectors/warden_client-rt/warden_client-rt.cfg
similarity index 100%
rename from warden3/contrib/connectors/warden_client-rt/warden_client-rt.cfg
rename to contrib/connectors/warden_client-rt/warden_client-rt.cfg
diff --git a/warden3/contrib/connectors/warden_client-rt/warden_client-rt.py b/contrib/connectors/warden_client-rt/warden_client-rt.py
similarity index 100%
rename from warden3/contrib/connectors/warden_client-rt/warden_client-rt.py
rename to contrib/connectors/warden_client-rt/warden_client-rt.py
diff --git a/warden3/contrib/warden_filer/LICENSE b/warden_client/LICENSE
similarity index 100%
rename from warden3/contrib/warden_filer/LICENSE
rename to warden_client/LICENSE
diff --git a/warden3/warden_client/README b/warden_client/README
similarity index 100%
rename from warden3/warden_client/README
rename to warden_client/README
diff --git a/warden3/warden_client/warden_client.cfg.dist b/warden_client/warden_client.cfg.dist
similarity index 100%
rename from warden3/warden_client/warden_client.cfg.dist
rename to warden_client/warden_client.cfg.dist
diff --git a/warden3/warden_client/warden_client.py b/warden_client/warden_client.py
similarity index 100%
rename from warden3/warden_client/warden_client.py
rename to warden_client/warden_client.py
diff --git a/warden3/warden_client/warden_client_examples.py b/warden_client/warden_client_examples.py
similarity index 100%
rename from warden3/warden_client/warden_client_examples.py
rename to warden_client/warden_client_examples.py
diff --git a/warden3/warden_client/warden_curl_test.sh b/warden_client/warden_curl_test.sh
similarity index 100%
rename from warden3/warden_client/warden_curl_test.sh
rename to warden_client/warden_curl_test.sh
diff --git a/warden3/warden_client/LICENSE b/warden_filer/LICENSE
similarity index 100%
rename from warden3/warden_client/LICENSE
rename to warden_filer/LICENSE
diff --git a/warden3/contrib/warden_filer/README b/warden_filer/README
similarity index 100%
rename from warden3/contrib/warden_filer/README
rename to warden_filer/README
diff --git a/warden3/contrib/warden_filer/check_file_count b/warden_filer/check_file_count
similarity index 100%
rename from warden3/contrib/warden_filer/check_file_count
rename to warden_filer/check_file_count
diff --git a/warden3/contrib/warden_filer/warden_filer.cfg.dist b/warden_filer/warden_filer.cfg.dist
similarity index 100%
rename from warden3/contrib/warden_filer/warden_filer.cfg.dist
rename to warden_filer/warden_filer.cfg.dist
diff --git a/warden3/contrib/warden_filer/warden_filer.py b/warden_filer/warden_filer.py
similarity index 100%
rename from warden3/contrib/warden_filer/warden_filer.py
rename to warden_filer/warden_filer.py
diff --git a/warden3/contrib/warden_filer/warden_filer_logrotate.dist b/warden_filer/warden_filer_logrotate.dist
similarity index 100%
rename from warden3/contrib/warden_filer/warden_filer_logrotate.dist
rename to warden_filer/warden_filer_logrotate.dist
diff --git a/warden3/contrib/warden_filer/warden_filer_receiver b/warden_filer/warden_filer_receiver
similarity index 100%
rename from warden3/contrib/warden_filer/warden_filer_receiver
rename to warden_filer/warden_filer_receiver
diff --git a/warden3/contrib/warden_filer/warden_filer_sender b/warden_filer/warden_filer_sender
similarity index 100%
rename from warden3/contrib/warden_filer/warden_filer_sender
rename to warden_filer/warden_filer_sender
diff --git a/warden3/contrib/warden_ra/LICENSE b/warden_ra/LICENSE
similarity index 100%
rename from warden3/contrib/warden_ra/LICENSE
rename to warden_ra/LICENSE
diff --git a/warden3/contrib/warden_ra/README b/warden_ra/README
similarity index 100%
rename from warden3/contrib/warden_ra/README
rename to warden_ra/README
diff --git a/warden3/contrib/warden_ra/apache22.conf b/warden_ra/apache22.conf
similarity index 100%
rename from warden3/contrib/warden_ra/apache22.conf
rename to warden_ra/apache22.conf
diff --git a/warden3/contrib/warden_ra/apache24.conf b/warden_ra/apache24.conf
similarity index 100%
rename from warden3/contrib/warden_ra/apache24.conf
rename to warden_ra/apache24.conf
diff --git a/warden3/contrib/warden_ra/ejbcaws.py b/warden_ra/ejbcaws.py
similarity index 100%
rename from warden3/contrib/warden_ra/ejbcaws.py
rename to warden_ra/ejbcaws.py
diff --git a/warden3/contrib/warden_ra/warden_apply.sh b/warden_ra/warden_apply.sh
similarity index 100%
rename from warden3/contrib/warden_ra/warden_apply.sh
rename to warden_ra/warden_apply.sh
diff --git a/warden3/contrib/warden_ra/warden_ra.cfg.dist b/warden_ra/warden_ra.cfg.dist
similarity index 100%
rename from warden3/contrib/warden_ra/warden_ra.cfg.dist
rename to warden_ra/warden_ra.cfg.dist
diff --git a/warden3/contrib/warden_ra/warden_ra.py b/warden_ra/warden_ra.py
similarity index 100%
rename from warden3/contrib/warden_ra/warden_ra.py
rename to warden_ra/warden_ra.py
diff --git a/warden3/contrib/warden_ra/warden_ra.wsgi b/warden_ra/warden_ra.wsgi
similarity index 100%
rename from warden3/contrib/warden_ra/warden_ra.wsgi
rename to warden_ra/warden_ra.wsgi
diff --git a/warden3/warden_server/LICENSE b/warden_server/LICENSE
similarity index 100%
rename from warden3/warden_server/LICENSE
rename to warden_server/LICENSE
diff --git a/warden3/warden_server/README b/warden_server/README
similarity index 100%
rename from warden3/warden_server/README
rename to warden_server/README
diff --git a/warden3/warden_server/apache22.conf.dist b/warden_server/apache22.conf.dist
similarity index 100%
rename from warden3/warden_server/apache22.conf.dist
rename to warden_server/apache22.conf.dist
diff --git a/warden3/warden_server/apache24.conf.dist b/warden_server/apache24.conf.dist
similarity index 100%
rename from warden3/warden_server/apache24.conf.dist
rename to warden_server/apache24.conf.dist
diff --git a/warden3/warden_server/catmap_mysql.json b/warden_server/catmap_mysql.json
similarity index 100%
rename from warden3/warden_server/catmap_mysql.json
rename to warden_server/catmap_mysql.json
diff --git a/warden3/warden_server/tagmap_mysql.json b/warden_server/tagmap_mysql.json
similarity index 100%
rename from warden3/warden_server/tagmap_mysql.json
rename to warden_server/tagmap_mysql.json
diff --git a/warden3/warden_server/warden_3.0.sql b/warden_server/warden_3.0.sql
similarity index 100%
rename from warden3/warden_server/warden_3.0.sql
rename to warden_server/warden_3.0.sql
diff --git a/warden3/warden_server/warden_server.cfg.dist b/warden_server/warden_server.cfg.dist
similarity index 100%
rename from warden3/warden_server/warden_server.cfg.dist
rename to warden_server/warden_server.cfg.dist
diff --git a/warden3/warden_server/warden_server.py b/warden_server/warden_server.py
similarity index 100%
rename from warden3/warden_server/warden_server.py
rename to warden_server/warden_server.py
diff --git a/warden3/warden_server/warden_server.wsgi.dist b/warden_server/warden_server.wsgi.dist
similarity index 100%
rename from warden3/warden_server/warden_server.wsgi.dist
rename to warden_server/warden_server.wsgi.dist