diff --git a/trunk/admin/artists.php b/admin/artists.php
similarity index 100%
rename from trunk/admin/artists.php
rename to admin/artists.php
diff --git a/trunk/admin/db.php b/admin/db.php
similarity index 100%
rename from trunk/admin/db.php
rename to admin/db.php
diff --git a/trunk/admin/debug.php b/admin/debug.php
similarity index 100%
rename from trunk/admin/debug.php
rename to admin/debug.php
diff --git a/trunk/admin/handlers.php b/admin/handlers.php
similarity index 100%
rename from trunk/admin/handlers.php
rename to admin/handlers.php
diff --git a/trunk/admin/import-export.php b/admin/import-export.php
similarity index 100%
rename from trunk/admin/import-export.php
rename to admin/import-export.php
diff --git a/trunk/admin/new.php b/admin/new.php
similarity index 100%
rename from trunk/admin/new.php
rename to admin/new.php
diff --git a/trunk/admin/settings.php b/admin/settings.php
similarity index 100%
rename from trunk/admin/settings.php
rename to admin/settings.php
diff --git a/trunk/admin/shows.php b/admin/shows.php
similarity index 100%
rename from trunk/admin/shows.php
rename to admin/shows.php
diff --git a/trunk/admin/tours.php b/admin/tours.php
similarity index 100%
rename from trunk/admin/tours.php
rename to admin/tours.php
diff --git a/trunk/admin/venues.php b/admin/venues.php
similarity index 100%
rename from trunk/admin/venues.php
rename to admin/venues.php
diff --git a/assets/banner-1544x500.jpg b/assets/banner-1544x500.jpg
deleted file mode 100644
index 7d65620..0000000
Binary files a/assets/banner-1544x500.jpg and /dev/null differ
diff --git a/assets/banner-772x250.jpg b/assets/banner-772x250.jpg
deleted file mode 100644
index 25e786d..0000000
Binary files a/assets/banner-772x250.jpg and /dev/null differ
diff --git a/assets/icon-128x128.jpg b/assets/icon-128x128.jpg
deleted file mode 100644
index 1593933..0000000
Binary files a/assets/icon-128x128.jpg and /dev/null differ
diff --git a/assets/icon-256x256.jpg b/assets/icon-256x256.jpg
deleted file mode 100644
index 814a247..0000000
Binary files a/assets/icon-256x256.jpg and /dev/null differ
diff --git a/trunk/css/gigpress-admin.css b/css/gigpress-admin.css
similarity index 100%
rename from trunk/css/gigpress-admin.css
rename to css/gigpress-admin.css
diff --git a/trunk/css/gigpress.css b/css/gigpress.css
similarity index 100%
rename from trunk/css/gigpress.css
rename to css/gigpress.css
diff --git a/trunk/gigpress.php b/gigpress.php
similarity index 100%
rename from trunk/gigpress.php
rename to gigpress.php
diff --git a/trunk/images/calendar-links-bg.png b/images/calendar-links-bg.png
similarity index 100%
rename from trunk/images/calendar-links-bg.png
rename to images/calendar-links-bg.png
diff --git a/trunk/images/calendar-toggle.png b/images/calendar-toggle.png
similarity index 100%
rename from trunk/images/calendar-toggle.png
rename to images/calendar-toggle.png
diff --git a/trunk/images/feed-icon-10x10.png b/images/feed-icon-10x10.png
similarity index 100%
rename from trunk/images/feed-icon-10x10.png
rename to images/feed-icon-10x10.png
diff --git a/trunk/images/feed-icon-12x12.png b/images/feed-icon-12x12.png
similarity index 100%
rename from trunk/images/feed-icon-12x12.png
rename to images/feed-icon-12x12.png
diff --git a/trunk/images/gigpress-icon-16.png b/images/gigpress-icon-16.png
similarity index 100%
rename from trunk/images/gigpress-icon-16.png
rename to images/gigpress-icon-16.png
diff --git a/trunk/images/gigpress-icon-32.png b/images/gigpress-icon-32.png
similarity index 100%
rename from trunk/images/gigpress-icon-32.png
rename to images/gigpress-icon-32.png
diff --git a/trunk/images/icalendar-icon.gif b/images/icalendar-icon.gif
similarity index 100%
rename from trunk/images/icalendar-icon.gif
rename to images/icalendar-icon.gif
diff --git a/trunk/images/sort.png b/images/sort.png
similarity index 100%
rename from trunk/images/sort.png
rename to images/sort.png
diff --git a/trunk/langs/gigpress-be_BY.mo b/langs/gigpress-be_BY.mo
similarity index 100%
rename from trunk/langs/gigpress-be_BY.mo
rename to langs/gigpress-be_BY.mo
diff --git a/trunk/langs/gigpress-be_BY.po b/langs/gigpress-be_BY.po
similarity index 100%
rename from trunk/langs/gigpress-be_BY.po
rename to langs/gigpress-be_BY.po
diff --git a/trunk/langs/gigpress-bg_BG.mo b/langs/gigpress-bg_BG.mo
similarity index 100%
rename from trunk/langs/gigpress-bg_BG.mo
rename to langs/gigpress-bg_BG.mo
diff --git a/trunk/langs/gigpress-bg_BG.po b/langs/gigpress-bg_BG.po
similarity index 100%
rename from trunk/langs/gigpress-bg_BG.po
rename to langs/gigpress-bg_BG.po
diff --git a/trunk/langs/gigpress-ca.mo b/langs/gigpress-ca.mo
similarity index 100%
rename from trunk/langs/gigpress-ca.mo
rename to langs/gigpress-ca.mo
diff --git a/trunk/langs/gigpress-ca.po b/langs/gigpress-ca.po
similarity index 100%
rename from trunk/langs/gigpress-ca.po
rename to langs/gigpress-ca.po
diff --git a/trunk/langs/gigpress-da_DK.mo b/langs/gigpress-da_DK.mo
similarity index 100%
rename from trunk/langs/gigpress-da_DK.mo
rename to langs/gigpress-da_DK.mo
diff --git a/trunk/langs/gigpress-da_DK.po b/langs/gigpress-da_DK.po
similarity index 100%
rename from trunk/langs/gigpress-da_DK.po
rename to langs/gigpress-da_DK.po
diff --git a/trunk/langs/gigpress-de_DE.mo b/langs/gigpress-de_DE.mo
similarity index 100%
rename from trunk/langs/gigpress-de_DE.mo
rename to langs/gigpress-de_DE.mo
diff --git a/trunk/langs/gigpress-de_DE.po b/langs/gigpress-de_DE.po
similarity index 100%
rename from trunk/langs/gigpress-de_DE.po
rename to langs/gigpress-de_DE.po
diff --git a/trunk/langs/gigpress-en_US.mo b/langs/gigpress-en_US.mo
similarity index 100%
rename from trunk/langs/gigpress-en_US.mo
rename to langs/gigpress-en_US.mo
diff --git a/trunk/langs/gigpress-en_US.pot b/langs/gigpress-en_US.pot
similarity index 100%
rename from trunk/langs/gigpress-en_US.pot
rename to langs/gigpress-en_US.pot
diff --git a/trunk/langs/gigpress-es_ES.mo b/langs/gigpress-es_ES.mo
similarity index 100%
rename from trunk/langs/gigpress-es_ES.mo
rename to langs/gigpress-es_ES.mo
diff --git a/trunk/langs/gigpress-es_ES.po b/langs/gigpress-es_ES.po
similarity index 100%
rename from trunk/langs/gigpress-es_ES.po
rename to langs/gigpress-es_ES.po
diff --git a/trunk/langs/gigpress-fi_FI.mo b/langs/gigpress-fi_FI.mo
similarity index 100%
rename from trunk/langs/gigpress-fi_FI.mo
rename to langs/gigpress-fi_FI.mo
diff --git a/trunk/langs/gigpress-fi_FI.po b/langs/gigpress-fi_FI.po
similarity index 100%
rename from trunk/langs/gigpress-fi_FI.po
rename to langs/gigpress-fi_FI.po
diff --git a/trunk/langs/gigpress-fr_FR.mo b/langs/gigpress-fr_FR.mo
similarity index 100%
rename from trunk/langs/gigpress-fr_FR.mo
rename to langs/gigpress-fr_FR.mo
diff --git a/trunk/langs/gigpress-fr_FR.po b/langs/gigpress-fr_FR.po
similarity index 100%
rename from trunk/langs/gigpress-fr_FR.po
rename to langs/gigpress-fr_FR.po
diff --git a/trunk/langs/gigpress-he_IL.mo b/langs/gigpress-he_IL.mo
similarity index 100%
rename from trunk/langs/gigpress-he_IL.mo
rename to langs/gigpress-he_IL.mo
diff --git a/trunk/langs/gigpress-he_IL.po b/langs/gigpress-he_IL.po
similarity index 100%
rename from trunk/langs/gigpress-he_IL.po
rename to langs/gigpress-he_IL.po
diff --git a/trunk/langs/gigpress-it_IT.mo b/langs/gigpress-it_IT.mo
similarity index 100%
rename from trunk/langs/gigpress-it_IT.mo
rename to langs/gigpress-it_IT.mo
diff --git a/trunk/langs/gigpress-it_IT.po b/langs/gigpress-it_IT.po
similarity index 100%
rename from trunk/langs/gigpress-it_IT.po
rename to langs/gigpress-it_IT.po
diff --git a/trunk/langs/gigpress-ja.mo b/langs/gigpress-ja.mo
similarity index 100%
rename from trunk/langs/gigpress-ja.mo
rename to langs/gigpress-ja.mo
diff --git a/trunk/langs/gigpress-ja.po b/langs/gigpress-ja.po
similarity index 100%
rename from trunk/langs/gigpress-ja.po
rename to langs/gigpress-ja.po
diff --git a/trunk/langs/gigpress-nb_NO.mo b/langs/gigpress-nb_NO.mo
similarity index 100%
rename from trunk/langs/gigpress-nb_NO.mo
rename to langs/gigpress-nb_NO.mo
diff --git a/trunk/langs/gigpress-nb_NO.po b/langs/gigpress-nb_NO.po
similarity index 100%
rename from trunk/langs/gigpress-nb_NO.po
rename to langs/gigpress-nb_NO.po
diff --git a/trunk/langs/gigpress-nl_NL.mo b/langs/gigpress-nl_NL.mo
similarity index 100%
rename from trunk/langs/gigpress-nl_NL.mo
rename to langs/gigpress-nl_NL.mo
diff --git a/trunk/langs/gigpress-nl_NL.po b/langs/gigpress-nl_NL.po
similarity index 100%
rename from trunk/langs/gigpress-nl_NL.po
rename to langs/gigpress-nl_NL.po
diff --git a/trunk/langs/gigpress-pl_PL.mo b/langs/gigpress-pl_PL.mo
similarity index 100%
rename from trunk/langs/gigpress-pl_PL.mo
rename to langs/gigpress-pl_PL.mo
diff --git a/trunk/langs/gigpress-pl_PL.po b/langs/gigpress-pl_PL.po
similarity index 100%
rename from trunk/langs/gigpress-pl_PL.po
rename to langs/gigpress-pl_PL.po
diff --git a/trunk/langs/gigpress-pt_BR.mo b/langs/gigpress-pt_BR.mo
similarity index 100%
rename from trunk/langs/gigpress-pt_BR.mo
rename to langs/gigpress-pt_BR.mo
diff --git a/trunk/langs/gigpress-pt_BR.po b/langs/gigpress-pt_BR.po
similarity index 100%
rename from trunk/langs/gigpress-pt_BR.po
rename to langs/gigpress-pt_BR.po
diff --git a/trunk/langs/gigpress-ro_RO.mo b/langs/gigpress-ro_RO.mo
similarity index 100%
rename from trunk/langs/gigpress-ro_RO.mo
rename to langs/gigpress-ro_RO.mo
diff --git a/trunk/langs/gigpress-ro_RO.po b/langs/gigpress-ro_RO.po
similarity index 100%
rename from trunk/langs/gigpress-ro_RO.po
rename to langs/gigpress-ro_RO.po
diff --git a/trunk/langs/gigpress-ru_RU.mo b/langs/gigpress-ru_RU.mo
similarity index 100%
rename from trunk/langs/gigpress-ru_RU.mo
rename to langs/gigpress-ru_RU.mo
diff --git a/trunk/langs/gigpress-ru_RU.po b/langs/gigpress-ru_RU.po
similarity index 100%
rename from trunk/langs/gigpress-ru_RU.po
rename to langs/gigpress-ru_RU.po
diff --git a/trunk/langs/gigpress-sk_SK.mo b/langs/gigpress-sk_SK.mo
similarity index 100%
rename from trunk/langs/gigpress-sk_SK.mo
rename to langs/gigpress-sk_SK.mo
diff --git a/trunk/langs/gigpress-sk_SK.po b/langs/gigpress-sk_SK.po
similarity index 100%
rename from trunk/langs/gigpress-sk_SK.po
rename to langs/gigpress-sk_SK.po
diff --git a/trunk/langs/gigpress-sv_SE.mo b/langs/gigpress-sv_SE.mo
similarity index 100%
rename from trunk/langs/gigpress-sv_SE.mo
rename to langs/gigpress-sv_SE.mo
diff --git a/trunk/langs/gigpress-sv_SE.po b/langs/gigpress-sv_SE.po
similarity index 100%
rename from trunk/langs/gigpress-sv_SE.po
rename to langs/gigpress-sv_SE.po
diff --git a/trunk/langs/gigpress-zh_CN.mo b/langs/gigpress-zh_CN.mo
similarity index 100%
rename from trunk/langs/gigpress-zh_CN.mo
rename to langs/gigpress-zh_CN.mo
diff --git a/trunk/langs/gigpress-zh_CN.po b/langs/gigpress-zh_CN.po
similarity index 100%
rename from trunk/langs/gigpress-zh_CN.po
rename to langs/gigpress-zh_CN.po
diff --git a/trunk/lib/countries.php b/lib/countries.php
similarity index 100%
rename from trunk/lib/countries.php
rename to lib/countries.php
diff --git a/trunk/lib/parsecsv.lib.php b/lib/parsecsv.lib.php
similarity index 100%
rename from trunk/lib/parsecsv.lib.php
rename to lib/parsecsv.lib.php
diff --git a/trunk/lib/upgrade.php b/lib/upgrade.php
similarity index 100%
rename from trunk/lib/upgrade.php
rename to lib/upgrade.php
diff --git a/trunk/output/feed.php b/output/feed.php
similarity index 100%
rename from trunk/output/feed.php
rename to output/feed.php
diff --git a/trunk/output/gigpress_related.php b/output/gigpress_related.php
similarity index 100%
rename from trunk/output/gigpress_related.php
rename to output/gigpress_related.php
diff --git a/trunk/output/gigpress_shows.php b/output/gigpress_shows.php
similarity index 100%
rename from trunk/output/gigpress_shows.php
rename to output/gigpress_shows.php
diff --git a/trunk/output/gigpress_sidebar.php b/output/gigpress_sidebar.php
similarity index 100%
rename from trunk/output/gigpress_sidebar.php
rename to output/gigpress_sidebar.php
diff --git a/trunk/output/ical.php b/output/ical.php
similarity index 100%
rename from trunk/output/ical.php
rename to output/ical.php
diff --git a/trunk/readme.txt b/readme.txt
similarity index 100%
rename from trunk/readme.txt
rename to readme.txt
diff --git a/trunk/scripts/gigpress-admin.js b/scripts/gigpress-admin.js
similarity index 100%
rename from trunk/scripts/gigpress-admin.js
rename to scripts/gigpress-admin.js
diff --git a/trunk/scripts/gigpress.js b/scripts/gigpress.js
similarity index 100%
rename from trunk/scripts/gigpress.js
rename to scripts/gigpress.js
diff --git a/trunk/templates/after-menu.php b/templates/after-menu.php
similarity index 100%
rename from trunk/templates/after-menu.php
rename to templates/after-menu.php
diff --git a/trunk/templates/before-menu.php b/templates/before-menu.php
similarity index 100%
rename from trunk/templates/before-menu.php
rename to templates/before-menu.php
diff --git a/trunk/templates/related.php b/templates/related.php
similarity index 100%
rename from trunk/templates/related.php
rename to templates/related.php
diff --git a/trunk/templates/shows-artist-heading.php b/templates/shows-artist-heading.php
similarity index 100%
rename from trunk/templates/shows-artist-heading.php
rename to templates/shows-artist-heading.php
diff --git a/trunk/templates/shows-list-empty.php b/templates/shows-list-empty.php
similarity index 100%
rename from trunk/templates/shows-list-empty.php
rename to templates/shows-list-empty.php
diff --git a/trunk/templates/shows-list-end.php b/templates/shows-list-end.php
similarity index 100%
rename from trunk/templates/shows-list-end.php
rename to templates/shows-list-end.php
diff --git a/trunk/templates/shows-list-footer.php b/templates/shows-list-footer.php
similarity index 100%
rename from trunk/templates/shows-list-footer.php
rename to templates/shows-list-footer.php
diff --git a/trunk/templates/shows-list-start.php b/templates/shows-list-start.php
similarity index 100%
rename from trunk/templates/shows-list-start.php
rename to templates/shows-list-start.php
diff --git a/trunk/templates/shows-list.php b/templates/shows-list.php
similarity index 100%
rename from trunk/templates/shows-list.php
rename to templates/shows-list.php
diff --git a/trunk/templates/shows-tour-heading.php b/templates/shows-tour-heading.php
similarity index 100%
rename from trunk/templates/shows-tour-heading.php
rename to templates/shows-tour-heading.php
diff --git a/trunk/templates/sidebar-artist-heading.php b/templates/sidebar-artist-heading.php
similarity index 100%
rename from trunk/templates/sidebar-artist-heading.php
rename to templates/sidebar-artist-heading.php
diff --git a/trunk/templates/sidebar-list-empty.php b/templates/sidebar-list-empty.php
similarity index 100%
rename from trunk/templates/sidebar-list-empty.php
rename to templates/sidebar-list-empty.php
diff --git a/trunk/templates/sidebar-list-end.php b/templates/sidebar-list-end.php
similarity index 100%
rename from trunk/templates/sidebar-list-end.php
rename to templates/sidebar-list-end.php
diff --git a/trunk/templates/sidebar-list-footer.php b/templates/sidebar-list-footer.php
similarity index 100%
rename from trunk/templates/sidebar-list-footer.php
rename to templates/sidebar-list-footer.php
diff --git a/trunk/templates/sidebar-list-start.php b/templates/sidebar-list-start.php
similarity index 100%
rename from trunk/templates/sidebar-list-start.php
rename to templates/sidebar-list-start.php
diff --git a/trunk/templates/sidebar-list.php b/templates/sidebar-list.php
similarity index 100%
rename from trunk/templates/sidebar-list.php
rename to templates/sidebar-list.php
diff --git a/trunk/templates/sidebar-tour-end.php b/templates/sidebar-tour-end.php
similarity index 100%
rename from trunk/templates/sidebar-tour-end.php
rename to templates/sidebar-tour-end.php
diff --git a/trunk/templates/sidebar-tour-heading.php b/templates/sidebar-tour-heading.php
similarity index 100%
rename from trunk/templates/sidebar-tour-heading.php
rename to templates/sidebar-tour-heading.php