diff --git a/sources/addons/README.md b/sources/addon/README.md
similarity index 100%
rename from sources/addons/README.md
rename to sources/addon/README.md
diff --git a/sources/addons/adultphotoflag/adultphotoflag.php b/sources/addon/adultphotoflag/adultphotoflag.php
similarity index 100%
rename from sources/addons/adultphotoflag/adultphotoflag.php
rename to sources/addon/adultphotoflag/adultphotoflag.php
diff --git a/sources/addons/bbmath/README b/sources/addon/bbmath/README
similarity index 100%
rename from sources/addons/bbmath/README
rename to sources/addon/bbmath/README
diff --git a/sources/addons/bbmath/bbmath.php b/sources/addon/bbmath/bbmath.php
similarity index 100%
rename from sources/addons/bbmath/bbmath.php
rename to sources/addon/bbmath/bbmath.php
diff --git a/sources/addons/bbmath/gpl.txt b/sources/addon/bbmath/gpl.txt
similarity index 100%
rename from sources/addons/bbmath/gpl.txt
rename to sources/addon/bbmath/gpl.txt
diff --git a/sources/addons/bbmath/phplatex.php b/sources/addon/bbmath/phplatex.php
similarity index 100%
rename from sources/addons/bbmath/phplatex.php
rename to sources/addon/bbmath/phplatex.php
diff --git a/sources/addons/bookmarker/bookmarker.php b/sources/addon/bookmarker/bookmarker.php
similarity index 100%
rename from sources/addons/bookmarker/bookmarker.php
rename to sources/addon/bookmarker/bookmarker.php
diff --git a/sources/addons/bookmarker/bookmarker.png b/sources/addon/bookmarker/bookmarker.png
similarity index 100%
rename from sources/addons/bookmarker/bookmarker.png
rename to sources/addon/bookmarker/bookmarker.png
diff --git a/sources/addons/buglink/bug-x.gif b/sources/addon/buglink/bug-x.gif
similarity index 100%
rename from sources/addons/buglink/bug-x.gif
rename to sources/addon/buglink/bug-x.gif
diff --git a/sources/addons/buglink/buglink.php b/sources/addon/buglink/buglink.php
similarity index 100%
rename from sources/addons/buglink/buglink.php
rename to sources/addon/buglink/buglink.php
diff --git a/sources/addons/buglink/lang/C/messages.po b/sources/addon/buglink/lang/C/messages.po
similarity index 100%
rename from sources/addons/buglink/lang/C/messages.po
rename to sources/addon/buglink/lang/C/messages.po
diff --git a/sources/addons/buglink/lang/ca/strings.php b/sources/addon/buglink/lang/ca/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/ca/strings.php
rename to sources/addon/buglink/lang/ca/strings.php
diff --git a/sources/addons/buglink/lang/cs/strings.php b/sources/addon/buglink/lang/cs/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/cs/strings.php
rename to sources/addon/buglink/lang/cs/strings.php
diff --git a/sources/addons/buglink/lang/de/strings.php b/sources/addon/buglink/lang/de/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/de/strings.php
rename to sources/addon/buglink/lang/de/strings.php
diff --git a/sources/addons/buglink/lang/eo/strings.php b/sources/addon/buglink/lang/eo/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/eo/strings.php
rename to sources/addon/buglink/lang/eo/strings.php
diff --git a/sources/addons/buglink/lang/es/strings.php b/sources/addon/buglink/lang/es/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/es/strings.php
rename to sources/addon/buglink/lang/es/strings.php
diff --git a/sources/addons/buglink/lang/fr/strings.php b/sources/addon/buglink/lang/fr/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/fr/strings.php
rename to sources/addon/buglink/lang/fr/strings.php
diff --git a/sources/addons/buglink/lang/is/strings.php b/sources/addon/buglink/lang/is/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/is/strings.php
rename to sources/addon/buglink/lang/is/strings.php
diff --git a/sources/addons/buglink/lang/it/strings.php b/sources/addon/buglink/lang/it/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/it/strings.php
rename to sources/addon/buglink/lang/it/strings.php
diff --git a/sources/addons/buglink/lang/nb-no/strings.php b/sources/addon/buglink/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/nb-no/strings.php
rename to sources/addon/buglink/lang/nb-no/strings.php
diff --git a/sources/addons/buglink/lang/pl/strings.php b/sources/addon/buglink/lang/pl/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/pl/strings.php
rename to sources/addon/buglink/lang/pl/strings.php
diff --git a/sources/addons/buglink/lang/pt-br/strings.php b/sources/addon/buglink/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/pt-br/strings.php
rename to sources/addon/buglink/lang/pt-br/strings.php
diff --git a/sources/addons/buglink/lang/ru/strings.php b/sources/addon/buglink/lang/ru/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/ru/strings.php
rename to sources/addon/buglink/lang/ru/strings.php
diff --git a/sources/addons/buglink/lang/sv/strings.php b/sources/addon/buglink/lang/sv/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/sv/strings.php
rename to sources/addon/buglink/lang/sv/strings.php
diff --git a/sources/addons/buglink/lang/zh-cn/strings.php b/sources/addon/buglink/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/buglink/lang/zh-cn/strings.php
rename to sources/addon/buglink/lang/zh-cn/strings.php
diff --git a/sources/addons/calc/calc.apd b/sources/addon/calc/calc.apd
similarity index 100%
rename from sources/addons/calc/calc.apd
rename to sources/addon/calc/calc.apd
diff --git a/sources/addons/calc/calc.php b/sources/addon/calc/calc.php
similarity index 100%
rename from sources/addons/calc/calc.php
rename to sources/addon/calc/calc.php
diff --git a/sources/addons/calc/calc.png b/sources/addon/calc/calc.png
similarity index 100%
rename from sources/addons/calc/calc.png
rename to sources/addon/calc/calc.png
diff --git a/sources/addons/chords/README.md b/sources/addon/chords/README.md
similarity index 100%
rename from sources/addons/chords/README.md
rename to sources/addon/chords/README.md
diff --git a/sources/addons/chords/chord b/sources/addon/chords/chord
similarity index 100%
rename from sources/addons/chords/chord
rename to sources/addon/chords/chord
diff --git a/sources/addons/chords/chord-generator.cpp b/sources/addon/chords/chord-generator.cpp
similarity index 100%
rename from sources/addons/chords/chord-generator.cpp
rename to sources/addon/chords/chord-generator.cpp
diff --git a/sources/addons/chords/chords.apd b/sources/addon/chords/chords.apd
similarity index 100%
rename from sources/addons/chords/chords.apd
rename to sources/addon/chords/chords.apd
diff --git a/sources/addons/chords/chords.php b/sources/addon/chords/chords.php
similarity index 100%
rename from sources/addons/chords/chords.php
rename to sources/addon/chords/chords.php
diff --git a/sources/addons/chords/chords.png b/sources/addon/chords/chords.png
similarity index 100%
rename from sources/addons/chords/chords.png
rename to sources/addon/chords/chords.png
diff --git a/sources/addons/custom_home/README.md b/sources/addon/custom_home/README.md
similarity index 100%
rename from sources/addons/custom_home/README.md
rename to sources/addon/custom_home/README.md
diff --git a/sources/addons/custom_home/custom_home.php b/sources/addon/custom_home/custom_home.php
similarity index 100%
rename from sources/addons/custom_home/custom_home.php
rename to sources/addon/custom_home/custom_home.php
diff --git a/sources/addons/dfedfix/dfedfix.php b/sources/addon/dfedfix/dfedfix.php
similarity index 100%
rename from sources/addons/dfedfix/dfedfix.php
rename to sources/addon/dfedfix/dfedfix.php
diff --git a/sources/addons/diaspora/diaspora.php b/sources/addon/diaspora/diaspora.php
similarity index 100%
rename from sources/addons/diaspora/diaspora.php
rename to sources/addon/diaspora/diaspora.php
diff --git a/sources/addons/diaspora/lang/C/messages.po b/sources/addon/diaspora/lang/C/messages.po
similarity index 100%
rename from sources/addons/diaspora/lang/C/messages.po
rename to sources/addon/diaspora/lang/C/messages.po
diff --git a/sources/addons/diaspora/lang/nl/strings.php b/sources/addon/diaspora/lang/nl/strings.php
similarity index 100%
rename from sources/addons/diaspora/lang/nl/strings.php
rename to sources/addon/diaspora/lang/nl/strings.php
diff --git a/sources/addons/diaspora/p.php b/sources/addon/diaspora/p.php
similarity index 100%
rename from sources/addons/diaspora/p.php
rename to sources/addon/diaspora/p.php
diff --git a/sources/addons/diaspora/receive.php b/sources/addon/diaspora/receive.php
similarity index 100%
rename from sources/addons/diaspora/receive.php
rename to sources/addon/diaspora/receive.php
diff --git a/sources/addons/diaspora/view/tpl/diaspora_comment.tpl b/sources/addon/diaspora/view/tpl/diaspora_comment.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_comment.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_comment.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_comment_relay.tpl b/sources/addon/diaspora/view/tpl/diaspora_comment_relay.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_comment_relay.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_comment_relay.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_consensus.tpl b/sources/addon/diaspora/view/tpl/diaspora_consensus.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_consensus.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_consensus.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_conversation.tpl b/sources/addon/diaspora/view/tpl/diaspora_conversation.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_conversation.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_conversation.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_like.tpl b/sources/addon/diaspora/view/tpl/diaspora_like.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_like.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_like.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_like_relay.tpl b/sources/addon/diaspora/view/tpl/diaspora_like_relay.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_like_relay.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_like_relay.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_message.tpl b/sources/addon/diaspora/view/tpl/diaspora_message.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_message.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_message.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_photo.tpl b/sources/addon/diaspora/view/tpl/diaspora_photo.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_photo.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_photo.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_post.tpl b/sources/addon/diaspora/view/tpl/diaspora_post.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_post.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_post.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_profile.tpl b/sources/addon/diaspora/view/tpl/diaspora_profile.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_profile.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_profile.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_relay_retraction.tpl b/sources/addon/diaspora/view/tpl/diaspora_relay_retraction.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_relay_retraction.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_relay_retraction.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_relayable_retraction.tpl b/sources/addon/diaspora/view/tpl/diaspora_relayable_retraction.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_relayable_retraction.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_relayable_retraction.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_reshare.tpl b/sources/addon/diaspora/view/tpl/diaspora_reshare.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_reshare.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_reshare.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_retract.tpl b/sources/addon/diaspora/view/tpl/diaspora_retract.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_retract.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_retract.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_share.tpl b/sources/addon/diaspora/view/tpl/diaspora_share.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_share.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_share.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_signed_retract.tpl b/sources/addon/diaspora/view/tpl/diaspora_signed_retract.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_signed_retract.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_signed_retract.tpl
diff --git a/sources/addons/diaspora/view/tpl/diaspora_vcard.tpl b/sources/addon/diaspora/view/tpl/diaspora_vcard.tpl
similarity index 100%
rename from sources/addons/diaspora/view/tpl/diaspora_vcard.tpl
rename to sources/addon/diaspora/view/tpl/diaspora_vcard.tpl
diff --git a/sources/addons/diaspost/diasphp.php b/sources/addon/diaspost/diasphp.php
similarity index 100%
rename from sources/addons/diaspost/diasphp.php
rename to sources/addon/diaspost/diasphp.php
diff --git a/sources/addons/diaspost/diaspora.png b/sources/addon/diaspost/diaspora.png
similarity index 100%
rename from sources/addons/diaspost/diaspora.png
rename to sources/addon/diaspost/diaspora.png
diff --git a/sources/addons/diaspost/diaspost.css b/sources/addon/diaspost/diaspost.css
similarity index 100%
rename from sources/addons/diaspost/diaspost.css
rename to sources/addon/diaspost/diaspost.css
diff --git a/sources/addons/diaspost/diaspost.php b/sources/addon/diaspost/diaspost.php
similarity index 100%
rename from sources/addons/diaspost/diaspost.php
rename to sources/addon/diaspost/diaspost.php
diff --git a/sources/addons/dirstats/dirstats.php b/sources/addon/dirstats/dirstats.php
similarity index 100%
rename from sources/addons/dirstats/dirstats.php
rename to sources/addon/dirstats/dirstats.php
diff --git a/sources/addons/dirstats/view/tpl/dirstats.tpl b/sources/addon/dirstats/view/tpl/dirstats.tpl
similarity index 100%
rename from sources/addons/dirstats/view/tpl/dirstats.tpl
rename to sources/addon/dirstats/view/tpl/dirstats.tpl
diff --git a/sources/addons/donate/donate.apd b/sources/addon/donate/donate.apd
similarity index 100%
rename from sources/addons/donate/donate.apd
rename to sources/addon/donate/donate.apd
diff --git a/sources/addons/donate/donate.php b/sources/addon/donate/donate.php
similarity index 100%
rename from sources/addons/donate/donate.php
rename to sources/addon/donate/donate.php
diff --git a/sources/addons/donate/donate.png b/sources/addon/donate/donate.png
similarity index 100%
rename from sources/addons/donate/donate.png
rename to sources/addon/donate/donate.png
diff --git a/sources/addons/donate/tipping.jpg b/sources/addon/donate/tipping.jpg
similarity index 100%
rename from sources/addons/donate/tipping.jpg
rename to sources/addon/donate/tipping.jpg
diff --git a/sources/addons/donate/view/tpl/donate.tpl b/sources/addon/donate/view/tpl/donate.tpl
similarity index 100%
rename from sources/addons/donate/view/tpl/donate.tpl
rename to sources/addon/donate/view/tpl/donate.tpl
diff --git a/sources/addons/dwpost/dwpost.css b/sources/addon/dwpost/dwpost.css
similarity index 100%
rename from sources/addons/dwpost/dwpost.css
rename to sources/addon/dwpost/dwpost.css
diff --git a/sources/addons/dwpost/dwpost.php b/sources/addon/dwpost/dwpost.php
similarity index 100%
rename from sources/addons/dwpost/dwpost.php
rename to sources/addon/dwpost/dwpost.php
diff --git a/sources/addons/dwpost/lang/C/messages.po b/sources/addon/dwpost/lang/C/messages.po
similarity index 100%
rename from sources/addons/dwpost/lang/C/messages.po
rename to sources/addon/dwpost/lang/C/messages.po
diff --git a/sources/addons/dwpost/lang/ca/strings.php b/sources/addon/dwpost/lang/ca/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/ca/strings.php
rename to sources/addon/dwpost/lang/ca/strings.php
diff --git a/sources/addons/dwpost/lang/cs/strings.php b/sources/addon/dwpost/lang/cs/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/cs/strings.php
rename to sources/addon/dwpost/lang/cs/strings.php
diff --git a/sources/addons/dwpost/lang/de/strings.php b/sources/addon/dwpost/lang/de/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/de/strings.php
rename to sources/addon/dwpost/lang/de/strings.php
diff --git a/sources/addons/dwpost/lang/eo/strings.php b/sources/addon/dwpost/lang/eo/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/eo/strings.php
rename to sources/addon/dwpost/lang/eo/strings.php
diff --git a/sources/addons/dwpost/lang/es/strings.php b/sources/addon/dwpost/lang/es/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/es/strings.php
rename to sources/addon/dwpost/lang/es/strings.php
diff --git a/sources/addons/dwpost/lang/fr/strings.php b/sources/addon/dwpost/lang/fr/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/fr/strings.php
rename to sources/addon/dwpost/lang/fr/strings.php
diff --git a/sources/addons/dwpost/lang/is/strings.php b/sources/addon/dwpost/lang/is/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/is/strings.php
rename to sources/addon/dwpost/lang/is/strings.php
diff --git a/sources/addons/dwpost/lang/it/strings.php b/sources/addon/dwpost/lang/it/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/it/strings.php
rename to sources/addon/dwpost/lang/it/strings.php
diff --git a/sources/addons/dwpost/lang/nb-no/strings.php b/sources/addon/dwpost/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/nb-no/strings.php
rename to sources/addon/dwpost/lang/nb-no/strings.php
diff --git a/sources/addons/dwpost/lang/pl/strings.php b/sources/addon/dwpost/lang/pl/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/pl/strings.php
rename to sources/addon/dwpost/lang/pl/strings.php
diff --git a/sources/addons/dwpost/lang/pt-br/strings.php b/sources/addon/dwpost/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/pt-br/strings.php
rename to sources/addon/dwpost/lang/pt-br/strings.php
diff --git a/sources/addons/dwpost/lang/ru/strings.php b/sources/addon/dwpost/lang/ru/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/ru/strings.php
rename to sources/addon/dwpost/lang/ru/strings.php
diff --git a/sources/addons/dwpost/lang/sv/strings.php b/sources/addon/dwpost/lang/sv/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/sv/strings.php
rename to sources/addon/dwpost/lang/sv/strings.php
diff --git a/sources/addons/dwpost/lang/zh-cn/strings.php b/sources/addon/dwpost/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/dwpost/lang/zh-cn/strings.php
rename to sources/addon/dwpost/lang/zh-cn/strings.php
diff --git a/sources/addons/extcron/extcron.php b/sources/addon/extcron/extcron.php
similarity index 100%
rename from sources/addons/extcron/extcron.php
rename to sources/addon/extcron/extcron.php
diff --git a/sources/addons/extcron/lang/C/messages.po b/sources/addon/extcron/lang/C/messages.po
similarity index 100%
rename from sources/addons/extcron/lang/C/messages.po
rename to sources/addon/extcron/lang/C/messages.po
diff --git a/sources/addons/flattrwidget/CHANGELOG b/sources/addon/flattrwidget/CHANGELOG
similarity index 100%
rename from sources/addons/flattrwidget/CHANGELOG
rename to sources/addon/flattrwidget/CHANGELOG
diff --git a/sources/addons/flattrwidget/README.md b/sources/addon/flattrwidget/README.md
similarity index 100%
rename from sources/addons/flattrwidget/README.md
rename to sources/addon/flattrwidget/README.md
diff --git a/sources/addons/flattrwidget/flattrwidget.php b/sources/addon/flattrwidget/flattrwidget.php
similarity index 100%
rename from sources/addons/flattrwidget/flattrwidget.php
rename to sources/addon/flattrwidget/flattrwidget.php
diff --git a/sources/addons/flattrwidget/img/flattr-badge-large.png b/sources/addon/flattrwidget/img/flattr-badge-large.png
similarity index 100%
rename from sources/addons/flattrwidget/img/flattr-badge-large.png
rename to sources/addon/flattrwidget/img/flattr-badge-large.png
diff --git a/sources/addons/flattrwidget/img/red-flattr-widget.png b/sources/addon/flattrwidget/img/red-flattr-widget.png
similarity index 100%
rename from sources/addons/flattrwidget/img/red-flattr-widget.png
rename to sources/addon/flattrwidget/img/red-flattr-widget.png
diff --git a/sources/addons/flattrwidget/img/red-flattr-widget2.png b/sources/addon/flattrwidget/img/red-flattr-widget2.png
similarity index 100%
rename from sources/addons/flattrwidget/img/red-flattr-widget2.png
rename to sources/addon/flattrwidget/img/red-flattr-widget2.png
diff --git a/sources/addons/flattrwidget/style.css b/sources/addon/flattrwidget/style.css
similarity index 100%
rename from sources/addons/flattrwidget/style.css
rename to sources/addon/flattrwidget/style.css
diff --git a/sources/addons/fortunate/README b/sources/addon/fortunate/README
similarity index 100%
rename from sources/addons/fortunate/README
rename to sources/addon/fortunate/README
diff --git a/sources/addons/fortunate/cookie.php b/sources/addon/fortunate/cookie.php
similarity index 100%
rename from sources/addons/fortunate/cookie.php
rename to sources/addon/fortunate/cookie.php
diff --git a/sources/addons/fortunate/fortunate.apd b/sources/addon/fortunate/fortunate.apd
similarity index 100%
rename from sources/addons/fortunate/fortunate.apd
rename to sources/addon/fortunate/fortunate.apd
diff --git a/sources/addons/fortunate/fortunate.css b/sources/addon/fortunate/fortunate.css
similarity index 100%
rename from sources/addons/fortunate/fortunate.css
rename to sources/addon/fortunate/fortunate.css
diff --git a/sources/addons/fortunate/fortunate.php b/sources/addon/fortunate/fortunate.php
similarity index 100%
rename from sources/addons/fortunate/fortunate.php
rename to sources/addon/fortunate/fortunate.php
diff --git a/sources/addons/fortunate/fortunate.png b/sources/addon/fortunate/fortunate.png
similarity index 100%
rename from sources/addons/fortunate/fortunate.png
rename to sources/addon/fortunate/fortunate.png
diff --git a/sources/addon/fortunate/fortunemod.sql.gz b/sources/addon/fortunate/fortunemod.sql.gz
new file mode 100644
index 00000000..2ce0e557
Binary files /dev/null and b/sources/addon/fortunate/fortunemod.sql.gz differ
diff --git a/sources/addons/frphotos/frphotohelper.php b/sources/addon/frphotos/frphotohelper.php
similarity index 100%
rename from sources/addons/frphotos/frphotohelper.php
rename to sources/addon/frphotos/frphotohelper.php
diff --git a/sources/addons/frphotos/frphotos.php b/sources/addon/frphotos/frphotos.php
similarity index 100%
rename from sources/addons/frphotos/frphotos.php
rename to sources/addon/frphotos/frphotos.php
diff --git a/sources/addons/frphotos/view/tpl/frphotos.tpl b/sources/addon/frphotos/view/tpl/frphotos.tpl
similarity index 100%
rename from sources/addons/frphotos/view/tpl/frphotos.tpl
rename to sources/addon/frphotos/view/tpl/frphotos.tpl
diff --git a/sources/addons/gnusoc/gnusoc-32.png b/sources/addon/gnusoc/gnusoc-32.png
similarity index 100%
rename from sources/addons/gnusoc/gnusoc-32.png
rename to sources/addon/gnusoc/gnusoc-32.png
diff --git a/sources/addons/gnusoc/gnusoc.php b/sources/addon/gnusoc/gnusoc.php
similarity index 100%
rename from sources/addons/gnusoc/gnusoc.php
rename to sources/addon/gnusoc/gnusoc.php
diff --git a/sources/addons/gnusoc/salmon.php b/sources/addon/gnusoc/salmon.php
similarity index 100%
rename from sources/addons/gnusoc/salmon.php
rename to sources/addon/gnusoc/salmon.php
diff --git a/sources/addons/gnusoc/view/tpl/follow_slap.tpl b/sources/addon/gnusoc/view/tpl/follow_slap.tpl
similarity index 100%
rename from sources/addons/gnusoc/view/tpl/follow_slap.tpl
rename to sources/addon/gnusoc/view/tpl/follow_slap.tpl
diff --git a/sources/addons/gnusoc/view/tpl/magicsig.tpl b/sources/addon/gnusoc/view/tpl/magicsig.tpl
similarity index 100%
rename from sources/addons/gnusoc/view/tpl/magicsig.tpl
rename to sources/addon/gnusoc/view/tpl/magicsig.tpl
diff --git a/sources/addons/hexit/hexit.apd b/sources/addon/hexit/hexit.apd
similarity index 100%
rename from sources/addons/hexit/hexit.apd
rename to sources/addon/hexit/hexit.apd
diff --git a/sources/addons/hexit/hexit.php b/sources/addon/hexit/hexit.php
similarity index 100%
rename from sources/addons/hexit/hexit.php
rename to sources/addon/hexit/hexit.php
diff --git a/sources/addons/hexit/hexit.png b/sources/addon/hexit/hexit.png
similarity index 100%
rename from sources/addons/hexit/hexit.png
rename to sources/addon/hexit/hexit.png
diff --git a/sources/addons/hubwall/hubwall.php b/sources/addon/hubwall/hubwall.php
similarity index 100%
rename from sources/addons/hubwall/hubwall.php
rename to sources/addon/hubwall/hubwall.php
diff --git a/sources/addons/hubwall/view/tpl/hubwall_form.tpl b/sources/addon/hubwall/view/tpl/hubwall_form.tpl
similarity index 100%
rename from sources/addons/hubwall/view/tpl/hubwall_form.tpl
rename to sources/addon/hubwall/view/tpl/hubwall_form.tpl
diff --git a/sources/addons/ijpost/ijpost.css b/sources/addon/ijpost/ijpost.css
similarity index 100%
rename from sources/addons/ijpost/ijpost.css
rename to sources/addon/ijpost/ijpost.css
diff --git a/sources/addons/ijpost/ijpost.php b/sources/addon/ijpost/ijpost.php
similarity index 100%
rename from sources/addons/ijpost/ijpost.php
rename to sources/addon/ijpost/ijpost.php
diff --git a/sources/addons/ijpost/lang/C/messages.po b/sources/addon/ijpost/lang/C/messages.po
similarity index 100%
rename from sources/addons/ijpost/lang/C/messages.po
rename to sources/addon/ijpost/lang/C/messages.po
diff --git a/sources/addons/ijpost/lang/ca/strings.php b/sources/addon/ijpost/lang/ca/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/ca/strings.php
rename to sources/addon/ijpost/lang/ca/strings.php
diff --git a/sources/addons/ijpost/lang/cs/strings.php b/sources/addon/ijpost/lang/cs/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/cs/strings.php
rename to sources/addon/ijpost/lang/cs/strings.php
diff --git a/sources/addons/ijpost/lang/de/strings.php b/sources/addon/ijpost/lang/de/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/de/strings.php
rename to sources/addon/ijpost/lang/de/strings.php
diff --git a/sources/addons/ijpost/lang/eo/strings.php b/sources/addon/ijpost/lang/eo/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/eo/strings.php
rename to sources/addon/ijpost/lang/eo/strings.php
diff --git a/sources/addons/ijpost/lang/es/strings.php b/sources/addon/ijpost/lang/es/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/es/strings.php
rename to sources/addon/ijpost/lang/es/strings.php
diff --git a/sources/addons/ijpost/lang/fr/strings.php b/sources/addon/ijpost/lang/fr/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/fr/strings.php
rename to sources/addon/ijpost/lang/fr/strings.php
diff --git a/sources/addons/ijpost/lang/is/strings.php b/sources/addon/ijpost/lang/is/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/is/strings.php
rename to sources/addon/ijpost/lang/is/strings.php
diff --git a/sources/addons/ijpost/lang/it/strings.php b/sources/addon/ijpost/lang/it/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/it/strings.php
rename to sources/addon/ijpost/lang/it/strings.php
diff --git a/sources/addons/ijpost/lang/nb-no/strings.php b/sources/addon/ijpost/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/nb-no/strings.php
rename to sources/addon/ijpost/lang/nb-no/strings.php
diff --git a/sources/addons/ijpost/lang/nl/strings.php b/sources/addon/ijpost/lang/nl/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/nl/strings.php
rename to sources/addon/ijpost/lang/nl/strings.php
diff --git a/sources/addons/ijpost/lang/pl/strings.php b/sources/addon/ijpost/lang/pl/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/pl/strings.php
rename to sources/addon/ijpost/lang/pl/strings.php
diff --git a/sources/addons/ijpost/lang/pt-br/strings.php b/sources/addon/ijpost/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/pt-br/strings.php
rename to sources/addon/ijpost/lang/pt-br/strings.php
diff --git a/sources/addons/ijpost/lang/ru/strings.php b/sources/addon/ijpost/lang/ru/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/ru/strings.php
rename to sources/addon/ijpost/lang/ru/strings.php
diff --git a/sources/addons/ijpost/lang/sv/strings.php b/sources/addon/ijpost/lang/sv/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/sv/strings.php
rename to sources/addon/ijpost/lang/sv/strings.php
diff --git a/sources/addons/ijpost/lang/zh-cn/strings.php b/sources/addon/ijpost/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/ijpost/lang/zh-cn/strings.php
rename to sources/addon/ijpost/lang/zh-cn/strings.php
diff --git a/sources/addons/irc/irc.apd b/sources/addon/irc/irc.apd
similarity index 100%
rename from sources/addons/irc/irc.apd
rename to sources/addon/irc/irc.apd
diff --git a/sources/addons/irc/irc.css b/sources/addon/irc/irc.css
similarity index 100%
rename from sources/addons/irc/irc.css
rename to sources/addon/irc/irc.css
diff --git a/sources/addons/irc/irc.php b/sources/addon/irc/irc.php
similarity index 100%
rename from sources/addons/irc/irc.php
rename to sources/addon/irc/irc.php
diff --git a/sources/addons/irc/irc.png b/sources/addon/irc/irc.png
similarity index 100%
rename from sources/addons/irc/irc.png
rename to sources/addon/irc/irc.png
diff --git a/sources/addons/jappixmini/MIT.txt b/sources/addon/jappixmini/MIT.txt
similarity index 100%
rename from sources/addons/jappixmini/MIT.txt
rename to sources/addon/jappixmini/MIT.txt
diff --git a/sources/addons/jappixmini/README b/sources/addon/jappixmini/README
similarity index 100%
rename from sources/addons/jappixmini/README
rename to sources/addon/jappixmini/README
diff --git a/sources/addons/jappixmini/jappix/AUTHORS b/sources/addon/jappixmini/jappix/AUTHORS
similarity index 100%
rename from sources/addons/jappixmini/jappix/AUTHORS
rename to sources/addon/jappixmini/jappix/AUTHORS
diff --git a/sources/addons/jappixmini/jappix/COPYING b/sources/addon/jappixmini/jappix/COPYING
similarity index 100%
rename from sources/addons/jappixmini/jappix/COPYING
rename to sources/addon/jappixmini/jappix/COPYING
diff --git a/sources/addons/jappixmini/jappix/INSTALL b/sources/addon/jappixmini/jappix/INSTALL
similarity index 100%
rename from sources/addons/jappixmini/jappix/INSTALL
rename to sources/addon/jappixmini/jappix/INSTALL
diff --git a/sources/addons/jappixmini/jappix/README b/sources/addon/jappixmini/jappix/README
similarity index 100%
rename from sources/addons/jappixmini/jappix/README
rename to sources/addon/jappixmini/jappix/README
diff --git a/sources/addons/jappixmini/jappix/THANKS b/sources/addon/jappixmini/jappix/THANKS
similarity index 100%
rename from sources/addons/jappixmini/jappix/THANKS
rename to sources/addon/jappixmini/jappix/THANKS
diff --git a/sources/addons/jappixmini/jappix/VERSION b/sources/addon/jappixmini/jappix/VERSION
similarity index 100%
rename from sources/addons/jappixmini/jappix/VERSION
rename to sources/addon/jappixmini/jappix/VERSION
diff --git a/sources/addons/jappixmini/jappix/css/adhoc.css b/sources/addon/jappixmini/jappix/css/adhoc.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/adhoc.css
rename to sources/addon/jappixmini/jappix/css/adhoc.css
diff --git a/sources/addons/jappixmini/jappix/css/anonymous.css b/sources/addon/jappixmini/jappix/css/anonymous.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/anonymous.css
rename to sources/addon/jappixmini/jappix/css/anonymous.css
diff --git a/sources/addons/jappixmini/jappix/css/archives.css b/sources/addon/jappixmini/jappix/css/archives.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/archives.css
rename to sources/addon/jappixmini/jappix/css/archives.css
diff --git a/sources/addons/jappixmini/jappix/css/board.css b/sources/addon/jappixmini/jappix/css/board.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/board.css
rename to sources/addon/jappixmini/jappix/css/board.css
diff --git a/sources/addons/jappixmini/jappix/css/buddylist.css b/sources/addon/jappixmini/jappix/css/buddylist.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/buddylist.css
rename to sources/addon/jappixmini/jappix/css/buddylist.css
diff --git a/sources/addons/jappixmini/jappix/css/channel.css b/sources/addon/jappixmini/jappix/css/channel.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/channel.css
rename to sources/addon/jappixmini/jappix/css/channel.css
diff --git a/sources/addons/jappixmini/jappix/css/directory.css b/sources/addon/jappixmini/jappix/css/directory.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/directory.css
rename to sources/addon/jappixmini/jappix/css/directory.css
diff --git a/sources/addons/jappixmini/jappix/css/discovery.css b/sources/addon/jappixmini/jappix/css/discovery.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/discovery.css
rename to sources/addon/jappixmini/jappix/css/discovery.css
diff --git a/sources/addons/jappixmini/jappix/css/favorites.css b/sources/addon/jappixmini/jappix/css/favorites.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/favorites.css
rename to sources/addon/jappixmini/jappix/css/favorites.css
diff --git a/sources/addons/jappixmini/jappix/css/home.css b/sources/addon/jappixmini/jappix/css/home.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/home.css
rename to sources/addon/jappixmini/jappix/css/home.css
diff --git a/sources/addons/jappixmini/jappix/css/ie.css b/sources/addon/jappixmini/jappix/css/ie.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/ie.css
rename to sources/addon/jappixmini/jappix/css/ie.css
diff --git a/sources/addons/jappixmini/jappix/css/images.css b/sources/addon/jappixmini/jappix/css/images.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/images.css
rename to sources/addon/jappixmini/jappix/css/images.css
diff --git a/sources/addons/jappixmini/jappix/css/inbox.css b/sources/addon/jappixmini/jappix/css/inbox.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/inbox.css
rename to sources/addon/jappixmini/jappix/css/inbox.css
diff --git a/sources/addons/jappixmini/jappix/css/install.css b/sources/addon/jappixmini/jappix/css/install.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/install.css
rename to sources/addon/jappixmini/jappix/css/install.css
diff --git a/sources/addons/jappixmini/jappix/css/integratebox.css b/sources/addon/jappixmini/jappix/css/integratebox.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/integratebox.css
rename to sources/addon/jappixmini/jappix/css/integratebox.css
diff --git a/sources/addons/jappixmini/jappix/css/jquery.datepicker.css b/sources/addon/jappixmini/jappix/css/jquery.datepicker.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/jquery.datepicker.css
rename to sources/addon/jappixmini/jappix/css/jquery.datepicker.css
diff --git a/sources/addons/jappixmini/jappix/css/main.css b/sources/addon/jappixmini/jappix/css/main.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/main.css
rename to sources/addon/jappixmini/jappix/css/main.css
diff --git a/sources/addons/jappixmini/jappix/css/manager.css b/sources/addon/jappixmini/jappix/css/manager.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/manager.css
rename to sources/addon/jappixmini/jappix/css/manager.css
diff --git a/sources/addons/jappixmini/jappix/css/me.css b/sources/addon/jappixmini/jappix/css/me.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/me.css
rename to sources/addon/jappixmini/jappix/css/me.css
diff --git a/sources/addons/jappixmini/jappix/css/mini-ie.css b/sources/addon/jappixmini/jappix/css/mini-ie.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/mini-ie.css
rename to sources/addon/jappixmini/jappix/css/mini-ie.css
diff --git a/sources/addons/jappixmini/jappix/css/mini.css b/sources/addon/jappixmini/jappix/css/mini.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/mini.css
rename to sources/addon/jappixmini/jappix/css/mini.css
diff --git a/sources/addons/jappixmini/jappix/css/mobile.css b/sources/addon/jappixmini/jappix/css/mobile.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/mobile.css
rename to sources/addon/jappixmini/jappix/css/mobile.css
diff --git a/sources/addons/jappixmini/jappix/css/mucadmin.css b/sources/addon/jappixmini/jappix/css/mucadmin.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/mucadmin.css
rename to sources/addon/jappixmini/jappix/css/mucadmin.css
diff --git a/sources/addons/jappixmini/jappix/css/myinfos.css b/sources/addon/jappixmini/jappix/css/myinfos.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/myinfos.css
rename to sources/addon/jappixmini/jappix/css/myinfos.css
diff --git a/sources/addons/jappixmini/jappix/css/options.css b/sources/addon/jappixmini/jappix/css/options.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/options.css
rename to sources/addon/jappixmini/jappix/css/options.css
diff --git a/sources/addons/jappixmini/jappix/css/others.css b/sources/addon/jappixmini/jappix/css/others.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/others.css
rename to sources/addon/jappixmini/jappix/css/others.css
diff --git a/sources/addons/jappixmini/jappix/css/pageengine.css b/sources/addon/jappixmini/jappix/css/pageengine.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/pageengine.css
rename to sources/addon/jappixmini/jappix/css/pageengine.css
diff --git a/sources/addons/jappixmini/jappix/css/pageswitch.css b/sources/addon/jappixmini/jappix/css/pageswitch.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/pageswitch.css
rename to sources/addon/jappixmini/jappix/css/pageswitch.css
diff --git a/sources/addons/jappixmini/jappix/css/popup.css b/sources/addon/jappixmini/jappix/css/popup.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/popup.css
rename to sources/addon/jappixmini/jappix/css/popup.css
diff --git a/sources/addons/jappixmini/jappix/css/privacy.css b/sources/addon/jappixmini/jappix/css/privacy.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/privacy.css
rename to sources/addon/jappixmini/jappix/css/privacy.css
diff --git a/sources/addons/jappixmini/jappix/css/rosterx.css b/sources/addon/jappixmini/jappix/css/rosterx.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/rosterx.css
rename to sources/addon/jappixmini/jappix/css/rosterx.css
diff --git a/sources/addons/jappixmini/jappix/css/search.css b/sources/addon/jappixmini/jappix/css/search.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/search.css
rename to sources/addon/jappixmini/jappix/css/search.css
diff --git a/sources/addons/jappixmini/jappix/css/smileys.css b/sources/addon/jappixmini/jappix/css/smileys.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/smileys.css
rename to sources/addon/jappixmini/jappix/css/smileys.css
diff --git a/sources/addons/jappixmini/jappix/css/stats-svg.css b/sources/addon/jappixmini/jappix/css/stats-svg.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/stats-svg.css
rename to sources/addon/jappixmini/jappix/css/stats-svg.css
diff --git a/sources/addons/jappixmini/jappix/css/tools.css b/sources/addon/jappixmini/jappix/css/tools.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/tools.css
rename to sources/addon/jappixmini/jappix/css/tools.css
diff --git a/sources/addons/jappixmini/jappix/css/userinfos.css b/sources/addon/jappixmini/jappix/css/userinfos.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/userinfos.css
rename to sources/addon/jappixmini/jappix/css/userinfos.css
diff --git a/sources/addons/jappixmini/jappix/css/vcard.css b/sources/addon/jappixmini/jappix/css/vcard.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/vcard.css
rename to sources/addon/jappixmini/jappix/css/vcard.css
diff --git a/sources/addons/jappixmini/jappix/css/welcome.css b/sources/addon/jappixmini/jappix/css/welcome.css
similarity index 100%
rename from sources/addons/jappixmini/jappix/css/welcome.css
rename to sources/addon/jappixmini/jappix/css/welcome.css
diff --git a/sources/addons/jappixmini/jappix/img/others/blank.gif b/sources/addon/jappixmini/jappix/img/others/blank.gif
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/others/blank.gif
rename to sources/addon/jappixmini/jappix/img/others/blank.gif
diff --git a/sources/addons/jappixmini/jappix/img/others/default-avatar.png b/sources/addon/jappixmini/jappix/img/others/default-avatar.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/others/default-avatar.png
rename to sources/addon/jappixmini/jappix/img/others/default-avatar.png
diff --git a/sources/addons/jappixmini/jappix/img/others/lock.png b/sources/addon/jappixmini/jappix/img/others/lock.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/others/lock.png
rename to sources/addon/jappixmini/jappix/img/others/lock.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/animate.gif b/sources/addon/jappixmini/jappix/img/sprites/animate.gif
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/animate.gif
rename to sources/addon/jappixmini/jappix/img/sprites/animate.gif
diff --git a/sources/addons/jappixmini/jappix/img/sprites/animate.png b/sources/addon/jappixmini/jappix/img/sprites/animate.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/animate.png
rename to sources/addon/jappixmini/jappix/img/sprites/animate.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/background.png b/sources/addon/jappixmini/jappix/img/sprites/background.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/background.png
rename to sources/addon/jappixmini/jappix/img/sprites/background.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/browsers.png b/sources/addon/jappixmini/jappix/img/sprites/browsers.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/browsers.png
rename to sources/addon/jappixmini/jappix/img/sprites/browsers.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/buttons.png b/sources/addon/jappixmini/jappix/img/sprites/buttons.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/buttons.png
rename to sources/addon/jappixmini/jappix/img/sprites/buttons.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/home.png b/sources/addon/jappixmini/jappix/img/sprites/home.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/home.png
rename to sources/addon/jappixmini/jappix/img/sprites/home.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/install.png b/sources/addon/jappixmini/jappix/img/sprites/install.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/install.png
rename to sources/addon/jappixmini/jappix/img/sprites/install.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/logs.png b/sources/addon/jappixmini/jappix/img/sprites/logs.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/logs.png
rename to sources/addon/jappixmini/jappix/img/sprites/logs.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/manager.png b/sources/addon/jappixmini/jappix/img/sprites/manager.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/manager.png
rename to sources/addon/jappixmini/jappix/img/sprites/manager.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/me.png b/sources/addon/jappixmini/jappix/img/sprites/me.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/me.png
rename to sources/addon/jappixmini/jappix/img/sprites/me.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/mini.gif b/sources/addon/jappixmini/jappix/img/sprites/mini.gif
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/mini.gif
rename to sources/addon/jappixmini/jappix/img/sprites/mini.gif
diff --git a/sources/addons/jappixmini/jappix/img/sprites/mini.png b/sources/addon/jappixmini/jappix/img/sprites/mini.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/mini.png
rename to sources/addon/jappixmini/jappix/img/sprites/mini.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/mobile.png b/sources/addon/jappixmini/jappix/img/sprites/mobile.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/mobile.png
rename to sources/addon/jappixmini/jappix/img/sprites/mobile.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/smileys.png b/sources/addon/jappixmini/jappix/img/sprites/smileys.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/smileys.png
rename to sources/addon/jappixmini/jappix/img/sprites/smileys.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/talk.png b/sources/addon/jappixmini/jappix/img/sprites/talk.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/talk.png
rename to sources/addon/jappixmini/jappix/img/sprites/talk.png
diff --git a/sources/addons/jappixmini/jappix/img/sprites/welcome.png b/sources/addon/jappixmini/jappix/img/sprites/welcome.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/sprites/welcome.png
rename to sources/addon/jappixmini/jappix/img/sprites/welcome.png
diff --git a/sources/addons/jappixmini/jappix/img/wait/wait-big.gif b/sources/addon/jappixmini/jappix/img/wait/wait-big.gif
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/wait/wait-big.gif
rename to sources/addon/jappixmini/jappix/img/wait/wait-big.gif
diff --git a/sources/addons/jappixmini/jappix/img/wait/wait-medium.png b/sources/addon/jappixmini/jappix/img/wait/wait-medium.png
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/wait/wait-medium.png
rename to sources/addon/jappixmini/jappix/img/wait/wait-medium.png
diff --git a/sources/addons/jappixmini/jappix/img/wait/wait-small.gif b/sources/addon/jappixmini/jappix/img/wait/wait-small.gif
similarity index 100%
rename from sources/addons/jappixmini/jappix/img/wait/wait-small.gif
rename to sources/addon/jappixmini/jappix/img/wait/wait-small.gif
diff --git a/sources/addons/jappixmini/jappix/js/adhoc.js b/sources/addon/jappixmini/jappix/js/adhoc.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/adhoc.js
rename to sources/addon/jappixmini/jappix/js/adhoc.js
diff --git a/sources/addons/jappixmini/jappix/js/anonymous.js b/sources/addon/jappixmini/jappix/js/anonymous.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/anonymous.js
rename to sources/addon/jappixmini/jappix/js/anonymous.js
diff --git a/sources/addons/jappixmini/jappix/js/archives.js b/sources/addon/jappixmini/jappix/js/archives.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/archives.js
rename to sources/addon/jappixmini/jappix/js/archives.js
diff --git a/sources/addons/jappixmini/jappix/js/audio.js b/sources/addon/jappixmini/jappix/js/audio.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/audio.js
rename to sources/addon/jappixmini/jappix/js/audio.js
diff --git a/sources/addons/jappixmini/jappix/js/autocompletion.js b/sources/addon/jappixmini/jappix/js/autocompletion.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/autocompletion.js
rename to sources/addon/jappixmini/jappix/js/autocompletion.js
diff --git a/sources/addons/jappixmini/jappix/js/avatar.js b/sources/addon/jappixmini/jappix/js/avatar.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/avatar.js
rename to sources/addon/jappixmini/jappix/js/avatar.js
diff --git a/sources/addons/jappixmini/jappix/js/base64.js b/sources/addon/jappixmini/jappix/js/base64.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/base64.js
rename to sources/addon/jappixmini/jappix/js/base64.js
diff --git a/sources/addons/jappixmini/jappix/js/board.js b/sources/addon/jappixmini/jappix/js/board.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/board.js
rename to sources/addon/jappixmini/jappix/js/board.js
diff --git a/sources/addons/jappixmini/jappix/js/browser-detect.js b/sources/addon/jappixmini/jappix/js/browser-detect.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/browser-detect.js
rename to sources/addon/jappixmini/jappix/js/browser-detect.js
diff --git a/sources/addons/jappixmini/jappix/js/bubble.js b/sources/addon/jappixmini/jappix/js/bubble.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/bubble.js
rename to sources/addon/jappixmini/jappix/js/bubble.js
diff --git a/sources/addons/jappixmini/jappix/js/caps.js b/sources/addon/jappixmini/jappix/js/caps.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/caps.js
rename to sources/addon/jappixmini/jappix/js/caps.js
diff --git a/sources/addons/jappixmini/jappix/js/chat.js b/sources/addon/jappixmini/jappix/js/chat.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/chat.js
rename to sources/addon/jappixmini/jappix/js/chat.js
diff --git a/sources/addons/jappixmini/jappix/js/chatstate.js b/sources/addon/jappixmini/jappix/js/chatstate.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/chatstate.js
rename to sources/addon/jappixmini/jappix/js/chatstate.js
diff --git a/sources/addons/jappixmini/jappix/js/common.js b/sources/addon/jappixmini/jappix/js/common.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/common.js
rename to sources/addon/jappixmini/jappix/js/common.js
diff --git a/sources/addons/jappixmini/jappix/js/connection.js b/sources/addon/jappixmini/jappix/js/connection.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/connection.js
rename to sources/addon/jappixmini/jappix/js/connection.js
diff --git a/sources/addons/jappixmini/jappix/js/constants.js b/sources/addon/jappixmini/jappix/js/constants.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/constants.js
rename to sources/addon/jappixmini/jappix/js/constants.js
diff --git a/sources/addons/jappixmini/jappix/js/dataform.js b/sources/addon/jappixmini/jappix/js/dataform.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/dataform.js
rename to sources/addon/jappixmini/jappix/js/dataform.js
diff --git a/sources/addons/jappixmini/jappix/js/datastore.js b/sources/addon/jappixmini/jappix/js/datastore.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/datastore.js
rename to sources/addon/jappixmini/jappix/js/datastore.js
diff --git a/sources/addons/jappixmini/jappix/js/date.js b/sources/addon/jappixmini/jappix/js/date.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/date.js
rename to sources/addon/jappixmini/jappix/js/date.js
diff --git a/sources/addons/jappixmini/jappix/js/directory.js b/sources/addon/jappixmini/jappix/js/directory.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/directory.js
rename to sources/addon/jappixmini/jappix/js/directory.js
diff --git a/sources/addons/jappixmini/jappix/js/discovery.js b/sources/addon/jappixmini/jappix/js/discovery.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/discovery.js
rename to sources/addon/jappixmini/jappix/js/discovery.js
diff --git a/sources/addons/jappixmini/jappix/js/error.js b/sources/addon/jappixmini/jappix/js/error.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/error.js
rename to sources/addon/jappixmini/jappix/js/error.js
diff --git a/sources/addons/jappixmini/jappix/js/favorites.js b/sources/addon/jappixmini/jappix/js/favorites.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/favorites.js
rename to sources/addon/jappixmini/jappix/js/favorites.js
diff --git a/sources/addons/jappixmini/jappix/js/features.js b/sources/addon/jappixmini/jappix/js/features.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/features.js
rename to sources/addon/jappixmini/jappix/js/features.js
diff --git a/sources/addons/jappixmini/jappix/js/filter.js b/sources/addon/jappixmini/jappix/js/filter.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/filter.js
rename to sources/addon/jappixmini/jappix/js/filter.js
diff --git a/sources/addons/jappixmini/jappix/js/groupchat.js b/sources/addon/jappixmini/jappix/js/groupchat.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/groupchat.js
rename to sources/addon/jappixmini/jappix/js/groupchat.js
diff --git a/sources/addons/jappixmini/jappix/js/home.js b/sources/addon/jappixmini/jappix/js/home.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/home.js
rename to sources/addon/jappixmini/jappix/js/home.js
diff --git a/sources/addons/jappixmini/jappix/js/httpauth.js b/sources/addon/jappixmini/jappix/js/httpauth.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/httpauth.js
rename to sources/addon/jappixmini/jappix/js/httpauth.js
diff --git a/sources/addons/jappixmini/jappix/js/inbox.js b/sources/addon/jappixmini/jappix/js/inbox.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/inbox.js
rename to sources/addon/jappixmini/jappix/js/inbox.js
diff --git a/sources/addons/jappixmini/jappix/js/integratebox.js b/sources/addon/jappixmini/jappix/js/integratebox.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/integratebox.js
rename to sources/addon/jappixmini/jappix/js/integratebox.js
diff --git a/sources/addons/jappixmini/jappix/js/interface.js b/sources/addon/jappixmini/jappix/js/interface.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/interface.js
rename to sources/addon/jappixmini/jappix/js/interface.js
diff --git a/sources/addons/jappixmini/jappix/js/iq.js b/sources/addon/jappixmini/jappix/js/iq.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/iq.js
rename to sources/addon/jappixmini/jappix/js/iq.js
diff --git a/sources/addons/jappixmini/jappix/js/jquery.datepicker.js b/sources/addon/jappixmini/jappix/js/jquery.datepicker.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jquery.datepicker.js
rename to sources/addon/jappixmini/jappix/js/jquery.datepicker.js
diff --git a/sources/addons/jappixmini/jappix/js/jquery.form.js b/sources/addon/jappixmini/jappix/js/jquery.form.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jquery.form.js
rename to sources/addon/jappixmini/jappix/js/jquery.form.js
diff --git a/sources/addons/jappixmini/jappix/js/jquery.js b/sources/addon/jappixmini/jappix/js/jquery.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jquery.js
rename to sources/addon/jappixmini/jappix/js/jquery.js
diff --git a/sources/addons/jappixmini/jappix/js/jquery.placeholder.js b/sources/addon/jappixmini/jappix/js/jquery.placeholder.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jquery.placeholder.js
rename to sources/addon/jappixmini/jappix/js/jquery.placeholder.js
diff --git a/sources/addons/jappixmini/jappix/js/jquery.textrange.js b/sources/addon/jappixmini/jappix/js/jquery.textrange.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jquery.textrange.js
rename to sources/addon/jappixmini/jappix/js/jquery.textrange.js
diff --git a/sources/addons/jappixmini/jappix/js/jquery.timers.js b/sources/addon/jappixmini/jappix/js/jquery.timers.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jquery.timers.js
rename to sources/addon/jappixmini/jappix/js/jquery.timers.js
diff --git a/sources/addons/jappixmini/jappix/js/jsjac.js b/sources/addon/jappixmini/jappix/js/jsjac.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jsjac.js
rename to sources/addon/jappixmini/jappix/js/jsjac.js
diff --git a/sources/addons/jappixmini/jappix/js/jxhr.js b/sources/addon/jappixmini/jappix/js/jxhr.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/jxhr.js
rename to sources/addon/jappixmini/jappix/js/jxhr.js
diff --git a/sources/addons/jappixmini/jappix/js/links.js b/sources/addon/jappixmini/jappix/js/links.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/links.js
rename to sources/addon/jappixmini/jappix/js/links.js
diff --git a/sources/addons/jappixmini/jappix/js/me.js b/sources/addon/jappixmini/jappix/js/me.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/me.js
rename to sources/addon/jappixmini/jappix/js/me.js
diff --git a/sources/addons/jappixmini/jappix/js/message.js b/sources/addon/jappixmini/jappix/js/message.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/message.js
rename to sources/addon/jappixmini/jappix/js/message.js
diff --git a/sources/addons/jappixmini/jappix/js/microblog.js b/sources/addon/jappixmini/jappix/js/microblog.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/microblog.js
rename to sources/addon/jappixmini/jappix/js/microblog.js
diff --git a/sources/addons/jappixmini/jappix/js/mini.js b/sources/addon/jappixmini/jappix/js/mini.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/mini.js
rename to sources/addon/jappixmini/jappix/js/mini.js
diff --git a/sources/addons/jappixmini/jappix/js/mobile.js b/sources/addon/jappixmini/jappix/js/mobile.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/mobile.js
rename to sources/addon/jappixmini/jappix/js/mobile.js
diff --git a/sources/addons/jappixmini/jappix/js/mucadmin.js b/sources/addon/jappixmini/jappix/js/mucadmin.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/mucadmin.js
rename to sources/addon/jappixmini/jappix/js/mucadmin.js
diff --git a/sources/addons/jappixmini/jappix/js/music.js b/sources/addon/jappixmini/jappix/js/music.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/music.js
rename to sources/addon/jappixmini/jappix/js/music.js
diff --git a/sources/addons/jappixmini/jappix/js/name.js b/sources/addon/jappixmini/jappix/js/name.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/name.js
rename to sources/addon/jappixmini/jappix/js/name.js
diff --git a/sources/addons/jappixmini/jappix/js/notification.js b/sources/addon/jappixmini/jappix/js/notification.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/notification.js
rename to sources/addon/jappixmini/jappix/js/notification.js
diff --git a/sources/addons/jappixmini/jappix/js/oob.js b/sources/addon/jappixmini/jappix/js/oob.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/oob.js
rename to sources/addon/jappixmini/jappix/js/oob.js
diff --git a/sources/addons/jappixmini/jappix/js/options.js b/sources/addon/jappixmini/jappix/js/options.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/options.js
rename to sources/addon/jappixmini/jappix/js/options.js
diff --git a/sources/addons/jappixmini/jappix/js/pep.js b/sources/addon/jappixmini/jappix/js/pep.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/pep.js
rename to sources/addon/jappixmini/jappix/js/pep.js
diff --git a/sources/addons/jappixmini/jappix/js/popup.js b/sources/addon/jappixmini/jappix/js/popup.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/popup.js
rename to sources/addon/jappixmini/jappix/js/popup.js
diff --git a/sources/addons/jappixmini/jappix/js/presence.js b/sources/addon/jappixmini/jappix/js/presence.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/presence.js
rename to sources/addon/jappixmini/jappix/js/presence.js
diff --git a/sources/addons/jappixmini/jappix/js/privacy.js b/sources/addon/jappixmini/jappix/js/privacy.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/privacy.js
rename to sources/addon/jappixmini/jappix/js/privacy.js
diff --git a/sources/addons/jappixmini/jappix/js/receipts.js b/sources/addon/jappixmini/jappix/js/receipts.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/receipts.js
rename to sources/addon/jappixmini/jappix/js/receipts.js
diff --git a/sources/addons/jappixmini/jappix/js/roster.js b/sources/addon/jappixmini/jappix/js/roster.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/roster.js
rename to sources/addon/jappixmini/jappix/js/roster.js
diff --git a/sources/addons/jappixmini/jappix/js/rosterx.js b/sources/addon/jappixmini/jappix/js/rosterx.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/rosterx.js
rename to sources/addon/jappixmini/jappix/js/rosterx.js
diff --git a/sources/addons/jappixmini/jappix/js/search.js b/sources/addon/jappixmini/jappix/js/search.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/search.js
rename to sources/addon/jappixmini/jappix/js/search.js
diff --git a/sources/addons/jappixmini/jappix/js/smileys.js b/sources/addon/jappixmini/jappix/js/smileys.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/smileys.js
rename to sources/addon/jappixmini/jappix/js/smileys.js
diff --git a/sources/addons/jappixmini/jappix/js/storage.js b/sources/addon/jappixmini/jappix/js/storage.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/storage.js
rename to sources/addon/jappixmini/jappix/js/storage.js
diff --git a/sources/addons/jappixmini/jappix/js/talk.js b/sources/addon/jappixmini/jappix/js/talk.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/talk.js
rename to sources/addon/jappixmini/jappix/js/talk.js
diff --git a/sources/addons/jappixmini/jappix/js/tooltip.js b/sources/addon/jappixmini/jappix/js/tooltip.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/tooltip.js
rename to sources/addon/jappixmini/jappix/js/tooltip.js
diff --git a/sources/addons/jappixmini/jappix/js/userinfos.js b/sources/addon/jappixmini/jappix/js/userinfos.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/userinfos.js
rename to sources/addon/jappixmini/jappix/js/userinfos.js
diff --git a/sources/addons/jappixmini/jappix/js/utilities.js b/sources/addon/jappixmini/jappix/js/utilities.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/utilities.js
rename to sources/addon/jappixmini/jappix/js/utilities.js
diff --git a/sources/addons/jappixmini/jappix/js/vcard.js b/sources/addon/jappixmini/jappix/js/vcard.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/vcard.js
rename to sources/addon/jappixmini/jappix/js/vcard.js
diff --git a/sources/addons/jappixmini/jappix/js/welcome.js b/sources/addon/jappixmini/jappix/js/welcome.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/welcome.js
rename to sources/addon/jappixmini/jappix/js/welcome.js
diff --git a/sources/addons/jappixmini/jappix/js/xmpplinks.js b/sources/addon/jappixmini/jappix/js/xmpplinks.js
similarity index 100%
rename from sources/addons/jappixmini/jappix/js/xmpplinks.js
rename to sources/addon/jappixmini/jappix/js/xmpplinks.js
diff --git a/sources/addons/jappixmini/jappix/lang/ar/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/ar/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/ar/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/ar/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/bg/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/bg/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/bg/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/bg/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/cs/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/cs/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/cs/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/cs/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/de/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/de/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/de/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/de/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/de/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/de/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/de/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/de/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot b/sources/addon/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot
rename to sources/addon/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot
diff --git a/sources/addons/jappixmini/jappix/lang/eo/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/eo/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/eo/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/eo/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/es/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/es/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/es/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/es/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/es/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/es/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/es/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/es/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/et/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/et/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/et/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/et/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/et/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/et/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/et/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/et/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/fa/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/fa/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/fa/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/fa/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/fr/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/fr/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/fr/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/fr/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/hu/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/hu/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/hu/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/hu/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/id/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/id/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/id/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/id/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/id/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/id/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/id/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/id/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/it/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/it/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/it/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/it/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/it/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/it/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/it/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/it/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/ja/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/ja/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/ja/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/ja/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/nl/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/nl/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/nl/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/nl/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/oc/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/oc/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/oc/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/oc/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/pl/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/pl/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/pl/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/pl/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/ru/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/ru/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/ru/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/ru/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/sk/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/sk/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/sk/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/sk/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/sv/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/sv/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/sv/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/sv/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/uk/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/uk/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/uk/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/uk/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/lang/zh/LC_MESSAGES/main.mo b/sources/addon/jappixmini/jappix/lang/zh/LC_MESSAGES/main.mo
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/zh/LC_MESSAGES/main.mo
rename to sources/addon/jappixmini/jappix/lang/zh/LC_MESSAGES/main.mo
diff --git a/sources/addons/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po b/sources/addon/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po
similarity index 100%
rename from sources/addons/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po
rename to sources/addon/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po
diff --git a/sources/addons/jappixmini/jappix/php/avatar-upload.php b/sources/addon/jappixmini/jappix/php/avatar-upload.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/avatar-upload.php
rename to sources/addon/jappixmini/jappix/php/avatar-upload.php
diff --git a/sources/addons/jappixmini/jappix/php/bosh.php b/sources/addon/jappixmini/jappix/php/bosh.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/bosh.php
rename to sources/addon/jappixmini/jappix/php/bosh.php
diff --git a/sources/addons/jappixmini/jappix/php/desktop.php b/sources/addon/jappixmini/jappix/php/desktop.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/desktop.php
rename to sources/addon/jappixmini/jappix/php/desktop.php
diff --git a/sources/addons/jappixmini/jappix/php/download-chat.php b/sources/addon/jappixmini/jappix/php/download-chat.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/download-chat.php
rename to sources/addon/jappixmini/jappix/php/download-chat.php
diff --git a/sources/addons/jappixmini/jappix/php/drawsvgchart.php b/sources/addon/jappixmini/jappix/php/drawsvgchart.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/drawsvgchart.php
rename to sources/addon/jappixmini/jappix/php/drawsvgchart.php
diff --git a/sources/addons/jappixmini/jappix/php/file-share.php b/sources/addon/jappixmini/jappix/php/file-share.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/file-share.php
rename to sources/addon/jappixmini/jappix/php/file-share.php
diff --git a/sources/addons/jappixmini/jappix/php/form-hosts.php b/sources/addon/jappixmini/jappix/php/form-hosts.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/form-hosts.php
rename to sources/addon/jappixmini/jappix/php/form-hosts.php
diff --git a/sources/addons/jappixmini/jappix/php/form-main.php b/sources/addon/jappixmini/jappix/php/form-main.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/form-main.php
rename to sources/addon/jappixmini/jappix/php/form-main.php
diff --git a/sources/addons/jappixmini/jappix/php/form-users.php b/sources/addon/jappixmini/jappix/php/form-users.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/form-users.php
rename to sources/addon/jappixmini/jappix/php/form-users.php
diff --git a/sources/addons/jappixmini/jappix/php/functions-get.php b/sources/addon/jappixmini/jappix/php/functions-get.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/functions-get.php
rename to sources/addon/jappixmini/jappix/php/functions-get.php
diff --git a/sources/addons/jappixmini/jappix/php/functions-manager.php b/sources/addon/jappixmini/jappix/php/functions-manager.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/functions-manager.php
rename to sources/addon/jappixmini/jappix/php/functions-manager.php
diff --git a/sources/addons/jappixmini/jappix/php/functions.php b/sources/addon/jappixmini/jappix/php/functions.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/functions.php
rename to sources/addon/jappixmini/jappix/php/functions.php
diff --git a/sources/addons/jappixmini/jappix/php/generate-chat.php b/sources/addon/jappixmini/jappix/php/generate-chat.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/generate-chat.php
rename to sources/addon/jappixmini/jappix/php/generate-chat.php
diff --git a/sources/addons/jappixmini/jappix/php/geolocation.php b/sources/addon/jappixmini/jappix/php/geolocation.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/geolocation.php
rename to sources/addon/jappixmini/jappix/php/geolocation.php
diff --git a/sources/addons/jappixmini/jappix/php/get-store.php b/sources/addon/jappixmini/jappix/php/get-store.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/get-store.php
rename to sources/addon/jappixmini/jappix/php/get-store.php
diff --git a/sources/addons/jappixmini/jappix/php/get.php b/sources/addon/jappixmini/jappix/php/get.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/get.php
rename to sources/addon/jappixmini/jappix/php/get.php
diff --git a/sources/addons/jappixmini/jappix/php/gettext.php b/sources/addon/jappixmini/jappix/php/gettext.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/gettext.php
rename to sources/addon/jappixmini/jappix/php/gettext.php
diff --git a/sources/addons/jappixmini/jappix/php/install.php b/sources/addon/jappixmini/jappix/php/install.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/install.php
rename to sources/addon/jappixmini/jappix/php/install.php
diff --git a/sources/addons/jappixmini/jappix/php/jsmin.php b/sources/addon/jappixmini/jappix/php/jsmin.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/jsmin.php
rename to sources/addon/jappixmini/jappix/php/jsmin.php
diff --git a/sources/addons/jappixmini/jappix/php/manager.php b/sources/addon/jappixmini/jappix/php/manager.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/manager.php
rename to sources/addon/jappixmini/jappix/php/manager.php
diff --git a/sources/addons/jappixmini/jappix/php/mobile-detect.php b/sources/addon/jappixmini/jappix/php/mobile-detect.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/mobile-detect.php
rename to sources/addon/jappixmini/jappix/php/mobile-detect.php
diff --git a/sources/addons/jappixmini/jappix/php/mobile.php b/sources/addon/jappixmini/jappix/php/mobile.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/mobile.php
rename to sources/addon/jappixmini/jappix/php/mobile.php
diff --git a/sources/addons/jappixmini/jappix/php/music-search.php b/sources/addon/jappixmini/jappix/php/music-search.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/music-search.php
rename to sources/addon/jappixmini/jappix/php/music-search.php
diff --git a/sources/addons/jappixmini/jappix/php/post-design.php b/sources/addon/jappixmini/jappix/php/post-design.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/post-design.php
rename to sources/addon/jappixmini/jappix/php/post-design.php
diff --git a/sources/addons/jappixmini/jappix/php/post-hosts.php b/sources/addon/jappixmini/jappix/php/post-hosts.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/post-hosts.php
rename to sources/addon/jappixmini/jappix/php/post-hosts.php
diff --git a/sources/addons/jappixmini/jappix/php/post-main.php b/sources/addon/jappixmini/jappix/php/post-main.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/post-main.php
rename to sources/addon/jappixmini/jappix/php/post-main.php
diff --git a/sources/addons/jappixmini/jappix/php/post-store.php b/sources/addon/jappixmini/jappix/php/post-store.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/post-store.php
rename to sources/addon/jappixmini/jappix/php/post-store.php
diff --git a/sources/addons/jappixmini/jappix/php/post-users.php b/sources/addon/jappixmini/jappix/php/post-users.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/post-users.php
rename to sources/addon/jappixmini/jappix/php/post-users.php
diff --git a/sources/addons/jappixmini/jappix/php/read-design.php b/sources/addon/jappixmini/jappix/php/read-design.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/read-design.php
rename to sources/addon/jappixmini/jappix/php/read-design.php
diff --git a/sources/addons/jappixmini/jappix/php/read-hosts.php b/sources/addon/jappixmini/jappix/php/read-hosts.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/read-hosts.php
rename to sources/addon/jappixmini/jappix/php/read-hosts.php
diff --git a/sources/addons/jappixmini/jappix/php/read-main.php b/sources/addon/jappixmini/jappix/php/read-main.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/read-main.php
rename to sources/addon/jappixmini/jappix/php/read-main.php
diff --git a/sources/addons/jappixmini/jappix/php/send.php b/sources/addon/jappixmini/jappix/php/send.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/send.php
rename to sources/addon/jappixmini/jappix/php/send.php
diff --git a/sources/addons/jappixmini/jappix/php/static.php b/sources/addon/jappixmini/jappix/php/static.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/static.php
rename to sources/addon/jappixmini/jappix/php/static.php
diff --git a/sources/addons/jappixmini/jappix/php/stats-svg.php b/sources/addon/jappixmini/jappix/php/stats-svg.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/stats-svg.php
rename to sources/addon/jappixmini/jappix/php/stats-svg.php
diff --git a/sources/addons/jappixmini/jappix/php/store-tree.php b/sources/addon/jappixmini/jappix/php/store-tree.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/store-tree.php
rename to sources/addon/jappixmini/jappix/php/store-tree.php
diff --git a/sources/addons/jappixmini/jappix/php/upload.php b/sources/addon/jappixmini/jappix/php/upload.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/upload.php
rename to sources/addon/jappixmini/jappix/php/upload.php
diff --git a/sources/addons/jappixmini/jappix/php/vars-design.php b/sources/addon/jappixmini/jappix/php/vars-design.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/vars-design.php
rename to sources/addon/jappixmini/jappix/php/vars-design.php
diff --git a/sources/addons/jappixmini/jappix/php/vars-hosts.php b/sources/addon/jappixmini/jappix/php/vars-hosts.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/vars-hosts.php
rename to sources/addon/jappixmini/jappix/php/vars-hosts.php
diff --git a/sources/addons/jappixmini/jappix/php/vars-main.php b/sources/addon/jappixmini/jappix/php/vars-main.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/vars-main.php
rename to sources/addon/jappixmini/jappix/php/vars-main.php
diff --git a/sources/addons/jappixmini/jappix/php/vars-store.php b/sources/addon/jappixmini/jappix/php/vars-store.php
similarity index 100%
rename from sources/addons/jappixmini/jappix/php/vars-store.php
rename to sources/addon/jappixmini/jappix/php/vars-store.php
diff --git a/sources/addons/jappixmini/jappix/snd/new-chat.oga b/sources/addon/jappixmini/jappix/snd/new-chat.oga
similarity index 100%
rename from sources/addons/jappixmini/jappix/snd/new-chat.oga
rename to sources/addon/jappixmini/jappix/snd/new-chat.oga
diff --git a/sources/addons/jappixmini/jappix/snd/notification.oga b/sources/addon/jappixmini/jappix/snd/notification.oga
similarity index 100%
rename from sources/addons/jappixmini/jappix/snd/notification.oga
rename to sources/addon/jappixmini/jappix/snd/notification.oga
diff --git a/sources/addons/jappixmini/jappix/snd/receive-message.oga b/sources/addon/jappixmini/jappix/snd/receive-message.oga
similarity index 100%
rename from sources/addons/jappixmini/jappix/snd/receive-message.oga
rename to sources/addon/jappixmini/jappix/snd/receive-message.oga
diff --git a/sources/addons/jappixmini/jappix/xml/anonymous.xml b/sources/addon/jappixmini/jappix/xml/anonymous.xml
similarity index 100%
rename from sources/addons/jappixmini/jappix/xml/anonymous.xml
rename to sources/addon/jappixmini/jappix/xml/anonymous.xml
diff --git a/sources/addons/jappixmini/jappix/xml/desktop.xml b/sources/addon/jappixmini/jappix/xml/desktop.xml
similarity index 100%
rename from sources/addons/jappixmini/jappix/xml/desktop.xml
rename to sources/addon/jappixmini/jappix/xml/desktop.xml
diff --git a/sources/addons/jappixmini/jappix/xml/install.xml b/sources/addon/jappixmini/jappix/xml/install.xml
similarity index 100%
rename from sources/addons/jappixmini/jappix/xml/install.xml
rename to sources/addon/jappixmini/jappix/xml/install.xml
diff --git a/sources/addons/jappixmini/jappix/xml/manager.xml b/sources/addon/jappixmini/jappix/xml/manager.xml
similarity index 100%
rename from sources/addons/jappixmini/jappix/xml/manager.xml
rename to sources/addon/jappixmini/jappix/xml/manager.xml
diff --git a/sources/addons/jappixmini/jappix/xml/mini.xml b/sources/addon/jappixmini/jappix/xml/mini.xml
similarity index 100%
rename from sources/addons/jappixmini/jappix/xml/mini.xml
rename to sources/addon/jappixmini/jappix/xml/mini.xml
diff --git a/sources/addons/jappixmini/jappix/xml/mobile.xml b/sources/addon/jappixmini/jappix/xml/mobile.xml
similarity index 100%
rename from sources/addons/jappixmini/jappix/xml/mobile.xml
rename to sources/addon/jappixmini/jappix/xml/mobile.xml
diff --git a/sources/addons/jappixmini/jappixmini.css b/sources/addon/jappixmini/jappixmini.css
similarity index 100%
rename from sources/addons/jappixmini/jappixmini.css
rename to sources/addon/jappixmini/jappixmini.css
diff --git a/sources/addons/jappixmini/jappixmini.php b/sources/addon/jappixmini/jappixmini.php
similarity index 100%
rename from sources/addons/jappixmini/jappixmini.php
rename to sources/addon/jappixmini/jappixmini.php
diff --git a/sources/addons/jappixmini/lang/C/messages.po b/sources/addon/jappixmini/lang/C/messages.po
similarity index 100%
rename from sources/addons/jappixmini/lang/C/messages.po
rename to sources/addon/jappixmini/lang/C/messages.po
diff --git a/sources/addons/jappixmini/lang/ca/strings.php b/sources/addon/jappixmini/lang/ca/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/ca/strings.php
rename to sources/addon/jappixmini/lang/ca/strings.php
diff --git a/sources/addons/jappixmini/lang/cs/strings.php b/sources/addon/jappixmini/lang/cs/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/cs/strings.php
rename to sources/addon/jappixmini/lang/cs/strings.php
diff --git a/sources/addons/jappixmini/lang/de/strings.php b/sources/addon/jappixmini/lang/de/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/de/strings.php
rename to sources/addon/jappixmini/lang/de/strings.php
diff --git a/sources/addons/jappixmini/lang/eo/strings.php b/sources/addon/jappixmini/lang/eo/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/eo/strings.php
rename to sources/addon/jappixmini/lang/eo/strings.php
diff --git a/sources/addons/jappixmini/lang/es/strings.php b/sources/addon/jappixmini/lang/es/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/es/strings.php
rename to sources/addon/jappixmini/lang/es/strings.php
diff --git a/sources/addons/jappixmini/lang/fr/strings.php b/sources/addon/jappixmini/lang/fr/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/fr/strings.php
rename to sources/addon/jappixmini/lang/fr/strings.php
diff --git a/sources/addons/jappixmini/lang/is/strings.php b/sources/addon/jappixmini/lang/is/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/is/strings.php
rename to sources/addon/jappixmini/lang/is/strings.php
diff --git a/sources/addons/jappixmini/lang/it/strings.php b/sources/addon/jappixmini/lang/it/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/it/strings.php
rename to sources/addon/jappixmini/lang/it/strings.php
diff --git a/sources/addons/jappixmini/lang/nb-no/strings.php b/sources/addon/jappixmini/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/nb-no/strings.php
rename to sources/addon/jappixmini/lang/nb-no/strings.php
diff --git a/sources/addons/jappixmini/lang/pl/strings.php b/sources/addon/jappixmini/lang/pl/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/pl/strings.php
rename to sources/addon/jappixmini/lang/pl/strings.php
diff --git a/sources/addons/jappixmini/lang/pt-br/strings.php b/sources/addon/jappixmini/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/pt-br/strings.php
rename to sources/addon/jappixmini/lang/pt-br/strings.php
diff --git a/sources/addons/jappixmini/lang/ru/strings.php b/sources/addon/jappixmini/lang/ru/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/ru/strings.php
rename to sources/addon/jappixmini/lang/ru/strings.php
diff --git a/sources/addons/jappixmini/lang/sv/strings.php b/sources/addon/jappixmini/lang/sv/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/sv/strings.php
rename to sources/addon/jappixmini/lang/sv/strings.php
diff --git a/sources/addons/jappixmini/lang/zh-cn/strings.php b/sources/addon/jappixmini/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/jappixmini/lang/zh-cn/strings.php
rename to sources/addon/jappixmini/lang/zh-cn/strings.php
diff --git a/sources/addons/jappixmini/lib.js b/sources/addon/jappixmini/lib.js
similarity index 100%
rename from sources/addons/jappixmini/lib.js
rename to sources/addon/jappixmini/lib.js
diff --git a/sources/addons/jappixmini/proxy.php b/sources/addon/jappixmini/proxy.php
similarity index 100%
rename from sources/addons/jappixmini/proxy.php
rename to sources/addon/jappixmini/proxy.php
diff --git a/sources/addons/js_upload/file-uploader/client/demo.htm b/sources/addon/js_upload/file-uploader/client/demo.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/client/demo.htm
rename to sources/addon/js_upload/file-uploader/client/demo.htm
diff --git a/sources/addons/js_upload/file-uploader/client/do-nothing.htm b/sources/addon/js_upload/file-uploader/client/do-nothing.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/client/do-nothing.htm
rename to sources/addon/js_upload/file-uploader/client/do-nothing.htm
diff --git a/sources/addons/js_upload/file-uploader/client/fileuploader.css b/sources/addon/js_upload/file-uploader/client/fileuploader.css
similarity index 100%
rename from sources/addons/js_upload/file-uploader/client/fileuploader.css
rename to sources/addon/js_upload/file-uploader/client/fileuploader.css
diff --git a/sources/addons/js_upload/file-uploader/client/fileuploader.js b/sources/addon/js_upload/file-uploader/client/fileuploader.js
similarity index 100%
rename from sources/addons/js_upload/file-uploader/client/fileuploader.js
rename to sources/addon/js_upload/file-uploader/client/fileuploader.js
diff --git a/sources/addons/js_upload/file-uploader/client/loading.gif b/sources/addon/js_upload/file-uploader/client/loading.gif
similarity index 100%
rename from sources/addons/js_upload/file-uploader/client/loading.gif
rename to sources/addon/js_upload/file-uploader/client/loading.gif
diff --git a/sources/addons/js_upload/file-uploader/gpl-2.0.txt b/sources/addon/js_upload/file-uploader/gpl-2.0.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/gpl-2.0.txt
rename to sources/addon/js_upload/file-uploader/gpl-2.0.txt
diff --git a/sources/addons/js_upload/file-uploader/license.txt b/sources/addon/js_upload/file-uploader/license.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/license.txt
rename to sources/addon/js_upload/file-uploader/license.txt
diff --git a/sources/addons/js_upload/file-uploader/readme.md b/sources/addon/js_upload/file-uploader/readme.md
similarity index 100%
rename from sources/addons/js_upload/file-uploader/readme.md
rename to sources/addon/js_upload/file-uploader/readme.md
diff --git a/sources/addons/js_upload/file-uploader/server/OctetStreamReader.java b/sources/addon/js_upload/file-uploader/server/OctetStreamReader.java
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/OctetStreamReader.java
rename to sources/addon/js_upload/file-uploader/server/OctetStreamReader.java
diff --git a/sources/addons/js_upload/file-uploader/server/coldfusion/coldfusion.cfc b/sources/addon/js_upload/file-uploader/server/coldfusion/coldfusion.cfc
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/coldfusion/coldfusion.cfc
rename to sources/addon/js_upload/file-uploader/server/coldfusion/coldfusion.cfc
diff --git a/sources/addons/js_upload/file-uploader/server/coldfusion/demo.cfm b/sources/addon/js_upload/file-uploader/server/coldfusion/demo.cfm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/coldfusion/demo.cfm
rename to sources/addon/js_upload/file-uploader/server/coldfusion/demo.cfm
diff --git a/sources/addons/js_upload/file-uploader/server/coldfusion/readme.txt b/sources/addon/js_upload/file-uploader/server/coldfusion/readme.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/coldfusion/readme.txt
rename to sources/addon/js_upload/file-uploader/server/coldfusion/readme.txt
diff --git a/sources/addons/js_upload/file-uploader/server/perl.cgi b/sources/addon/js_upload/file-uploader/server/perl.cgi
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/perl.cgi
rename to sources/addon/js_upload/file-uploader/server/perl.cgi
diff --git a/sources/addons/js_upload/file-uploader/server/php.php b/sources/addon/js_upload/file-uploader/server/php.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/php.php
rename to sources/addon/js_upload/file-uploader/server/php.php
diff --git a/sources/addons/js_upload/file-uploader/server/readme.txt b/sources/addon/js_upload/file-uploader/server/readme.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/readme.txt
rename to sources/addon/js_upload/file-uploader/server/readme.txt
diff --git a/sources/addons/js_upload/file-uploader/server/uploads/.gitignore b/sources/addon/js_upload/file-uploader/server/uploads/.gitignore
similarity index 100%
rename from sources/addons/js_upload/file-uploader/server/uploads/.gitignore
rename to sources/addon/js_upload/file-uploader/server/uploads/.gitignore
diff --git a/sources/addons/js_upload/file-uploader/tests/action-acceptance.php b/sources/addon/js_upload/file-uploader/tests/action-acceptance.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/action-acceptance.php
rename to sources/addon/js_upload/file-uploader/tests/action-acceptance.php
diff --git a/sources/addons/js_upload/file-uploader/tests/action-handler-queue-test.php b/sources/addon/js_upload/file-uploader/tests/action-handler-queue-test.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/action-handler-queue-test.php
rename to sources/addon/js_upload/file-uploader/tests/action-handler-queue-test.php
diff --git a/sources/addons/js_upload/file-uploader/tests/action-handler-test.php b/sources/addon/js_upload/file-uploader/tests/action-handler-test.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/action-handler-test.php
rename to sources/addon/js_upload/file-uploader/tests/action-handler-test.php
diff --git a/sources/addons/js_upload/file-uploader/tests/action-slow-response.php b/sources/addon/js_upload/file-uploader/tests/action-slow-response.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/action-slow-response.php
rename to sources/addon/js_upload/file-uploader/tests/action-slow-response.php
diff --git a/sources/addons/js_upload/file-uploader/tests/browser-bugs/safari-bug1.htm b/sources/addon/js_upload/file-uploader/tests/browser-bugs/safari-bug1.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/browser-bugs/safari-bug1.htm
rename to sources/addon/js_upload/file-uploader/tests/browser-bugs/safari-bug1.htm
diff --git a/sources/addons/js_upload/file-uploader/tests/browser-bugs/safari-bug2.htm b/sources/addon/js_upload/file-uploader/tests/browser-bugs/safari-bug2.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/browser-bugs/safari-bug2.htm
rename to sources/addon/js_upload/file-uploader/tests/browser-bugs/safari-bug2.htm
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/application-javascript.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/application-javascript.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/application-javascript.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/application-javascript.php
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/application-json.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/application-json.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/application-json.php
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/header-404.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/header-404.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/header-404.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/header-404.php
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/somepage.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/somepage.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/somepage.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/somepage.php
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-html-large.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-html-large.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-html-large.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-html-large.php
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-html.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-html.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-html.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-html.php
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-javascript.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-javascript.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-javascript.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-javascript.php
diff --git a/sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-plain.php b/sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-plain.php
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/iframe-content-tests/text-plain.php
rename to sources/addon/js_upload/file-uploader/tests/iframe-content-tests/text-plain.php
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-1.4.2.min.js b/sources/addon/js_upload/file-uploader/tests/jquery-1.4.2.min.js
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-1.4.2.min.js
rename to sources/addon/js_upload/file-uploader/tests/jquery-1.4.2.min.js
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/jquery-ui-1.8.4.custom.min.js b/sources/addon/js_upload/file-uploader/tests/jquery-ui/jquery-ui-1.8.4.custom.min.js
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/jquery-ui-1.8.4.custom.min.js
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/jquery-ui-1.8.4.custom.min.js
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_222222_256x240.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_222222_256x240.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_222222_256x240.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_228ef1_256x240.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_228ef1_256x240.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_228ef1_256x240.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_228ef1_256x240.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ef8c08_256x240.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ef8c08_256x240.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ef8c08_256x240.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ef8c08_256x240.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffd27a_256x240.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffd27a_256x240.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffd27a_256x240.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffd27a_256x240.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffffff_256x240.png b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffffff_256x240.png
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-icons_ffffff_256x240.png
diff --git a/sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/jquery-ui-1.8.4.custom.css b/sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/jquery-ui-1.8.4.custom.css
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/jquery-ui/ui-lightness/jquery-ui-1.8.4.custom.css
rename to sources/addon/js_upload/file-uploader/tests/jquery-ui/ui-lightness/jquery-ui-1.8.4.custom.css
diff --git a/sources/addons/js_upload/file-uploader/tests/qunit/package.json b/sources/addon/js_upload/file-uploader/tests/qunit/package.json
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/qunit/package.json
rename to sources/addon/js_upload/file-uploader/tests/qunit/package.json
diff --git a/sources/addons/js_upload/file-uploader/tests/qunit/qunit/qunit.css b/sources/addon/js_upload/file-uploader/tests/qunit/qunit/qunit.css
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/qunit/qunit/qunit.css
rename to sources/addon/js_upload/file-uploader/tests/qunit/qunit/qunit.css
diff --git a/sources/addons/js_upload/file-uploader/tests/qunit/qunit/qunit.js b/sources/addon/js_upload/file-uploader/tests/qunit/qunit/qunit.js
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/qunit/qunit/qunit.js
rename to sources/addon/js_upload/file-uploader/tests/qunit/qunit/qunit.js
diff --git a/sources/addons/js_upload/file-uploader/tests/qunit/test/index.html b/sources/addon/js_upload/file-uploader/tests/qunit/test/index.html
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/qunit/test/index.html
rename to sources/addon/js_upload/file-uploader/tests/qunit/test/index.html
diff --git a/sources/addons/js_upload/file-uploader/tests/qunit/test/same.js b/sources/addon/js_upload/file-uploader/tests/qunit/test/same.js
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/qunit/test/same.js
rename to sources/addon/js_upload/file-uploader/tests/qunit/test/same.js
diff --git a/sources/addons/js_upload/file-uploader/tests/qunit/test/test.js b/sources/addon/js_upload/file-uploader/tests/qunit/test/test.js
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/qunit/test/test.js
rename to sources/addon/js_upload/file-uploader/tests/qunit/test/test.js
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif b/sources/addon/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif
rename to sources/addon/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/2larger.txt b/sources/addon/js_upload/file-uploader/tests/sample-files/2larger.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/2larger.txt
rename to sources/addon/js_upload/file-uploader/tests/sample-files/2larger.txt
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/3empty.txt b/sources/addon/js_upload/file-uploader/tests/sample-files/3empty.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/3empty.txt
rename to sources/addon/js_upload/file-uploader/tests/sample-files/3empty.txt
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/4text.txt b/sources/addon/js_upload/file-uploader/tests/sample-files/4text.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/4text.txt
rename to sources/addon/js_upload/file-uploader/tests/sample-files/4text.txt
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/5text.txt b/sources/addon/js_upload/file-uploader/tests/sample-files/5text.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/5text.txt
rename to sources/addon/js_upload/file-uploader/tests/sample-files/5text.txt
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/6text.txt b/sources/addon/js_upload/file-uploader/tests/sample-files/6text.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/6text.txt
rename to sources/addon/js_upload/file-uploader/tests/sample-files/6text.txt
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/7small.txt b/sources/addon/js_upload/file-uploader/tests/sample-files/7small.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/7small.txt
rename to sources/addon/js_upload/file-uploader/tests/sample-files/7small.txt
diff --git a/sources/addons/js_upload/file-uploader/tests/sample-files/8text.txt b/sources/addon/js_upload/file-uploader/tests/sample-files/8text.txt
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/sample-files/8text.txt
rename to sources/addon/js_upload/file-uploader/tests/sample-files/8text.txt
diff --git a/sources/addons/js_upload/file-uploader/tests/separate-file-list.htm b/sources/addon/js_upload/file-uploader/tests/separate-file-list.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/separate-file-list.htm
rename to sources/addon/js_upload/file-uploader/tests/separate-file-list.htm
diff --git a/sources/addons/js_upload/file-uploader/tests/test-acceptance.htm b/sources/addon/js_upload/file-uploader/tests/test-acceptance.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/test-acceptance.htm
rename to sources/addon/js_upload/file-uploader/tests/test-acceptance.htm
diff --git a/sources/addons/js_upload/file-uploader/tests/test-drop-zone.htm b/sources/addon/js_upload/file-uploader/tests/test-drop-zone.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/test-drop-zone.htm
rename to sources/addon/js_upload/file-uploader/tests/test-drop-zone.htm
diff --git a/sources/addons/js_upload/file-uploader/tests/test-handler-queue.htm b/sources/addon/js_upload/file-uploader/tests/test-handler-queue.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/test-handler-queue.htm
rename to sources/addon/js_upload/file-uploader/tests/test-handler-queue.htm
diff --git a/sources/addons/js_upload/file-uploader/tests/test-upload-handlers.htm b/sources/addon/js_upload/file-uploader/tests/test-upload-handlers.htm
similarity index 100%
rename from sources/addons/js_upload/file-uploader/tests/test-upload-handlers.htm
rename to sources/addon/js_upload/file-uploader/tests/test-upload-handlers.htm
diff --git a/sources/addons/js_upload/js_upload.php b/sources/addon/js_upload/js_upload.php
similarity index 100%
rename from sources/addons/js_upload/js_upload.php
rename to sources/addon/js_upload/js_upload.php
diff --git a/sources/addons/js_upload/lang/C/messages.po b/sources/addon/js_upload/lang/C/messages.po
similarity index 100%
rename from sources/addons/js_upload/lang/C/messages.po
rename to sources/addon/js_upload/lang/C/messages.po
diff --git a/sources/addons/js_upload/lang/ca/strings.php b/sources/addon/js_upload/lang/ca/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/ca/strings.php
rename to sources/addon/js_upload/lang/ca/strings.php
diff --git a/sources/addons/js_upload/lang/cs/strings.php b/sources/addon/js_upload/lang/cs/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/cs/strings.php
rename to sources/addon/js_upload/lang/cs/strings.php
diff --git a/sources/addons/js_upload/lang/de/strings.php b/sources/addon/js_upload/lang/de/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/de/strings.php
rename to sources/addon/js_upload/lang/de/strings.php
diff --git a/sources/addons/js_upload/lang/eo/strings.php b/sources/addon/js_upload/lang/eo/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/eo/strings.php
rename to sources/addon/js_upload/lang/eo/strings.php
diff --git a/sources/addons/js_upload/lang/es/strings.php b/sources/addon/js_upload/lang/es/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/es/strings.php
rename to sources/addon/js_upload/lang/es/strings.php
diff --git a/sources/addons/js_upload/lang/fr/strings.php b/sources/addon/js_upload/lang/fr/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/fr/strings.php
rename to sources/addon/js_upload/lang/fr/strings.php
diff --git a/sources/addons/js_upload/lang/is/strings.php b/sources/addon/js_upload/lang/is/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/is/strings.php
rename to sources/addon/js_upload/lang/is/strings.php
diff --git a/sources/addons/js_upload/lang/it/strings.php b/sources/addon/js_upload/lang/it/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/it/strings.php
rename to sources/addon/js_upload/lang/it/strings.php
diff --git a/sources/addons/js_upload/lang/nb-no/strings.php b/sources/addon/js_upload/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/nb-no/strings.php
rename to sources/addon/js_upload/lang/nb-no/strings.php
diff --git a/sources/addons/js_upload/lang/nl/strings.php b/sources/addon/js_upload/lang/nl/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/nl/strings.php
rename to sources/addon/js_upload/lang/nl/strings.php
diff --git a/sources/addons/js_upload/lang/pl/strings.php b/sources/addon/js_upload/lang/pl/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/pl/strings.php
rename to sources/addon/js_upload/lang/pl/strings.php
diff --git a/sources/addons/js_upload/lang/pt-br/strings.php b/sources/addon/js_upload/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/pt-br/strings.php
rename to sources/addon/js_upload/lang/pt-br/strings.php
diff --git a/sources/addons/js_upload/lang/ru/strings.php b/sources/addon/js_upload/lang/ru/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/ru/strings.php
rename to sources/addon/js_upload/lang/ru/strings.php
diff --git a/sources/addons/js_upload/lang/sv/strings.php b/sources/addon/js_upload/lang/sv/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/sv/strings.php
rename to sources/addon/js_upload/lang/sv/strings.php
diff --git a/sources/addons/js_upload/lang/zh-cn/strings.php b/sources/addon/js_upload/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/js_upload/lang/zh-cn/strings.php
rename to sources/addon/js_upload/lang/zh-cn/strings.php
diff --git a/sources/addons/keepout/keepout.php b/sources/addon/keepout/keepout.php
similarity index 100%
rename from sources/addons/keepout/keepout.php
rename to sources/addon/keepout/keepout.php
diff --git a/sources/addons/ldapauth/README b/sources/addon/ldapauth/README
similarity index 100%
rename from sources/addons/ldapauth/README
rename to sources/addon/ldapauth/README
diff --git a/sources/addons/ldapauth/ldapauth.php b/sources/addon/ldapauth/ldapauth.php
similarity index 100%
rename from sources/addons/ldapauth/ldapauth.php
rename to sources/addon/ldapauth/ldapauth.php
diff --git a/sources/addons/libertree/lang/C/messages.po b/sources/addon/libertree/lang/C/messages.po
similarity index 100%
rename from sources/addons/libertree/lang/C/messages.po
rename to sources/addon/libertree/lang/C/messages.po
diff --git a/sources/addons/libertree/lang/ca/strings.php b/sources/addon/libertree/lang/ca/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/ca/strings.php
rename to sources/addon/libertree/lang/ca/strings.php
diff --git a/sources/addons/libertree/lang/cs/strings.php b/sources/addon/libertree/lang/cs/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/cs/strings.php
rename to sources/addon/libertree/lang/cs/strings.php
diff --git a/sources/addons/libertree/lang/de/strings.php b/sources/addon/libertree/lang/de/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/de/strings.php
rename to sources/addon/libertree/lang/de/strings.php
diff --git a/sources/addons/libertree/lang/eo/strings.php b/sources/addon/libertree/lang/eo/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/eo/strings.php
rename to sources/addon/libertree/lang/eo/strings.php
diff --git a/sources/addons/libertree/lang/es/strings.php b/sources/addon/libertree/lang/es/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/es/strings.php
rename to sources/addon/libertree/lang/es/strings.php
diff --git a/sources/addons/libertree/lang/fr/strings.php b/sources/addon/libertree/lang/fr/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/fr/strings.php
rename to sources/addon/libertree/lang/fr/strings.php
diff --git a/sources/addons/libertree/lang/is/strings.php b/sources/addon/libertree/lang/is/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/is/strings.php
rename to sources/addon/libertree/lang/is/strings.php
diff --git a/sources/addons/libertree/lang/it/strings.php b/sources/addon/libertree/lang/it/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/it/strings.php
rename to sources/addon/libertree/lang/it/strings.php
diff --git a/sources/addons/libertree/lang/nb-no/strings.php b/sources/addon/libertree/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/nb-no/strings.php
rename to sources/addon/libertree/lang/nb-no/strings.php
diff --git a/sources/addons/libertree/lang/nl/strings.php b/sources/addon/libertree/lang/nl/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/nl/strings.php
rename to sources/addon/libertree/lang/nl/strings.php
diff --git a/sources/addons/libertree/lang/pl/strings.php b/sources/addon/libertree/lang/pl/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/pl/strings.php
rename to sources/addon/libertree/lang/pl/strings.php
diff --git a/sources/addons/libertree/lang/pt-br/strings.php b/sources/addon/libertree/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/pt-br/strings.php
rename to sources/addon/libertree/lang/pt-br/strings.php
diff --git a/sources/addons/libertree/lang/ru/strings.php b/sources/addon/libertree/lang/ru/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/ru/strings.php
rename to sources/addon/libertree/lang/ru/strings.php
diff --git a/sources/addons/libertree/lang/sv/strings.php b/sources/addon/libertree/lang/sv/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/sv/strings.php
rename to sources/addon/libertree/lang/sv/strings.php
diff --git a/sources/addons/libertree/lang/zh-cn/strings.php b/sources/addon/libertree/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/libertree/lang/zh-cn/strings.php
rename to sources/addon/libertree/lang/zh-cn/strings.php
diff --git a/sources/addons/libertree/libertree.css b/sources/addon/libertree/libertree.css
similarity index 100%
rename from sources/addons/libertree/libertree.css
rename to sources/addon/libertree/libertree.css
diff --git a/sources/addons/libertree/libertree.php b/sources/addon/libertree/libertree.php
similarity index 100%
rename from sources/addons/libertree/libertree.php
rename to sources/addon/libertree/libertree.php
diff --git a/sources/addons/libertree/libertree.png b/sources/addon/libertree/libertree.png
similarity index 100%
rename from sources/addons/libertree/libertree.png
rename to sources/addon/libertree/libertree.png
diff --git a/sources/addons/likebanner/FreeSansBold.ttf b/sources/addon/likebanner/FreeSansBold.ttf
similarity index 100%
rename from sources/addons/likebanner/FreeSansBold.ttf
rename to sources/addon/likebanner/FreeSansBold.ttf
diff --git a/sources/addons/likebanner/like_banner.png b/sources/addon/likebanner/like_banner.png
similarity index 100%
rename from sources/addons/likebanner/like_banner.png
rename to sources/addon/likebanner/like_banner.png
diff --git a/sources/addons/likebanner/likebanner.apd b/sources/addon/likebanner/likebanner.apd
similarity index 100%
rename from sources/addons/likebanner/likebanner.apd
rename to sources/addon/likebanner/likebanner.apd
diff --git a/sources/addons/likebanner/likebanner.php b/sources/addon/likebanner/likebanner.php
similarity index 100%
rename from sources/addons/likebanner/likebanner.php
rename to sources/addon/likebanner/likebanner.php
diff --git a/sources/addons/likebanner/likebanner.png b/sources/addon/likebanner/likebanner.png
similarity index 100%
rename from sources/addons/likebanner/likebanner.png
rename to sources/addon/likebanner/likebanner.png
diff --git a/sources/addons/ljpost/lang/C/messages.po b/sources/addon/ljpost/lang/C/messages.po
similarity index 100%
rename from sources/addons/ljpost/lang/C/messages.po
rename to sources/addon/ljpost/lang/C/messages.po
diff --git a/sources/addons/ljpost/lang/ca/strings.php b/sources/addon/ljpost/lang/ca/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/ca/strings.php
rename to sources/addon/ljpost/lang/ca/strings.php
diff --git a/sources/addons/ljpost/lang/cs/strings.php b/sources/addon/ljpost/lang/cs/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/cs/strings.php
rename to sources/addon/ljpost/lang/cs/strings.php
diff --git a/sources/addons/ljpost/lang/de/strings.php b/sources/addon/ljpost/lang/de/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/de/strings.php
rename to sources/addon/ljpost/lang/de/strings.php
diff --git a/sources/addons/ljpost/lang/eo/strings.php b/sources/addon/ljpost/lang/eo/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/eo/strings.php
rename to sources/addon/ljpost/lang/eo/strings.php
diff --git a/sources/addons/ljpost/lang/es/strings.php b/sources/addon/ljpost/lang/es/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/es/strings.php
rename to sources/addon/ljpost/lang/es/strings.php
diff --git a/sources/addons/ljpost/lang/fr/strings.php b/sources/addon/ljpost/lang/fr/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/fr/strings.php
rename to sources/addon/ljpost/lang/fr/strings.php
diff --git a/sources/addons/ljpost/lang/is/strings.php b/sources/addon/ljpost/lang/is/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/is/strings.php
rename to sources/addon/ljpost/lang/is/strings.php
diff --git a/sources/addons/ljpost/lang/it/strings.php b/sources/addon/ljpost/lang/it/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/it/strings.php
rename to sources/addon/ljpost/lang/it/strings.php
diff --git a/sources/addons/ljpost/lang/nb-no/strings.php b/sources/addon/ljpost/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/nb-no/strings.php
rename to sources/addon/ljpost/lang/nb-no/strings.php
diff --git a/sources/addons/ljpost/lang/nl/strings.php b/sources/addon/ljpost/lang/nl/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/nl/strings.php
rename to sources/addon/ljpost/lang/nl/strings.php
diff --git a/sources/addons/ljpost/lang/pl/strings.php b/sources/addon/ljpost/lang/pl/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/pl/strings.php
rename to sources/addon/ljpost/lang/pl/strings.php
diff --git a/sources/addons/ljpost/lang/pt-br/strings.php b/sources/addon/ljpost/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/pt-br/strings.php
rename to sources/addon/ljpost/lang/pt-br/strings.php
diff --git a/sources/addons/ljpost/lang/ru/strings.php b/sources/addon/ljpost/lang/ru/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/ru/strings.php
rename to sources/addon/ljpost/lang/ru/strings.php
diff --git a/sources/addons/ljpost/lang/sv/strings.php b/sources/addon/ljpost/lang/sv/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/sv/strings.php
rename to sources/addon/ljpost/lang/sv/strings.php
diff --git a/sources/addons/ljpost/lang/zh-cn/strings.php b/sources/addon/ljpost/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/ljpost/lang/zh-cn/strings.php
rename to sources/addon/ljpost/lang/zh-cn/strings.php
diff --git a/sources/addons/ljpost/ljpost.css b/sources/addon/ljpost/ljpost.css
similarity index 100%
rename from sources/addons/ljpost/ljpost.css
rename to sources/addon/ljpost/ljpost.css
diff --git a/sources/addons/ljpost/ljpost.php b/sources/addon/ljpost/ljpost.php
similarity index 100%
rename from sources/addons/ljpost/ljpost.php
rename to sources/addon/ljpost/ljpost.php
diff --git a/sources/addons/logrot/logrot.php b/sources/addon/logrot/logrot.php
similarity index 100%
rename from sources/addons/logrot/logrot.php
rename to sources/addon/logrot/logrot.php
diff --git a/sources/addons/logrot/view/tpl/admin.tpl b/sources/addon/logrot/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/logrot/view/tpl/admin.tpl
rename to sources/addon/logrot/view/tpl/admin.tpl
diff --git a/sources/addons/mahjongg/mahjongg.apd b/sources/addon/mahjongg/mahjongg.apd
similarity index 100%
rename from sources/addons/mahjongg/mahjongg.apd
rename to sources/addon/mahjongg/mahjongg.apd
diff --git a/sources/addons/mahjongg/mahjongg.php b/sources/addon/mahjongg/mahjongg.php
similarity index 100%
rename from sources/addons/mahjongg/mahjongg.php
rename to sources/addon/mahjongg/mahjongg.php
diff --git a/sources/addons/mahjongg/mahjongg.png b/sources/addon/mahjongg/mahjongg.png
similarity index 100%
rename from sources/addons/mahjongg/mahjongg.png
rename to sources/addon/mahjongg/mahjongg.png
diff --git a/sources/addons/mahjongg/mahjongg.swf b/sources/addon/mahjongg/mahjongg.swf
similarity index 100%
rename from sources/addons/mahjongg/mahjongg.swf
rename to sources/addon/mahjongg/mahjongg.swf
diff --git a/sources/addons/mailhost/mailhost.css b/sources/addon/mailhost/mailhost.css
similarity index 100%
rename from sources/addons/mailhost/mailhost.css
rename to sources/addon/mailhost/mailhost.css
diff --git a/sources/addons/mailhost/mailhost.php b/sources/addon/mailhost/mailhost.php
similarity index 100%
rename from sources/addons/mailhost/mailhost.php
rename to sources/addon/mailhost/mailhost.php
diff --git a/sources/addons/metatag/LICENSE b/sources/addon/metatag/LICENSE
similarity index 100%
rename from sources/addons/metatag/LICENSE
rename to sources/addon/metatag/LICENSE
diff --git a/sources/addons/metatag/README.md b/sources/addon/metatag/README.md
similarity index 100%
rename from sources/addons/metatag/README.md
rename to sources/addon/metatag/README.md
diff --git a/sources/addons/metatag/install.txt b/sources/addon/metatag/install.txt
similarity index 100%
rename from sources/addons/metatag/install.txt
rename to sources/addon/metatag/install.txt
diff --git a/sources/addons/metatag/metatag.php b/sources/addon/metatag/metatag.php
similarity index 100%
rename from sources/addons/metatag/metatag.php
rename to sources/addon/metatag/metatag.php
diff --git a/sources/addons/morechoice/morechoice.php b/sources/addon/morechoice/morechoice.php
similarity index 100%
rename from sources/addons/morechoice/morechoice.php
rename to sources/addon/morechoice/morechoice.php
diff --git a/sources/addons/moremoods/moremoods.php b/sources/addon/moremoods/moremoods.php
similarity index 100%
rename from sources/addons/moremoods/moremoods.php
rename to sources/addon/moremoods/moremoods.php
diff --git a/sources/addons/morepokes/lang/C/messages.po b/sources/addon/morepokes/lang/C/messages.po
similarity index 100%
rename from sources/addons/morepokes/lang/C/messages.po
rename to sources/addon/morepokes/lang/C/messages.po
diff --git a/sources/addons/morepokes/lang/ca/strings.php b/sources/addon/morepokes/lang/ca/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/ca/strings.php
rename to sources/addon/morepokes/lang/ca/strings.php
diff --git a/sources/addons/morepokes/lang/cs/messages.po b/sources/addon/morepokes/lang/cs/messages.po
similarity index 100%
rename from sources/addons/morepokes/lang/cs/messages.po
rename to sources/addon/morepokes/lang/cs/messages.po
diff --git a/sources/addons/morepokes/lang/cs/strings.php b/sources/addon/morepokes/lang/cs/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/cs/strings.php
rename to sources/addon/morepokes/lang/cs/strings.php
diff --git a/sources/addons/morepokes/lang/de/messages.po b/sources/addon/morepokes/lang/de/messages.po
similarity index 100%
rename from sources/addons/morepokes/lang/de/messages.po
rename to sources/addon/morepokes/lang/de/messages.po
diff --git a/sources/addons/morepokes/lang/de/strings.php b/sources/addon/morepokes/lang/de/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/de/strings.php
rename to sources/addon/morepokes/lang/de/strings.php
diff --git a/sources/addons/morepokes/lang/eo/strings.php b/sources/addon/morepokes/lang/eo/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/eo/strings.php
rename to sources/addon/morepokes/lang/eo/strings.php
diff --git a/sources/addons/morepokes/lang/es/strings.php b/sources/addon/morepokes/lang/es/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/es/strings.php
rename to sources/addon/morepokes/lang/es/strings.php
diff --git a/sources/addons/morepokes/lang/fr/strings.php b/sources/addon/morepokes/lang/fr/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/fr/strings.php
rename to sources/addon/morepokes/lang/fr/strings.php
diff --git a/sources/addons/morepokes/lang/is/strings.php b/sources/addon/morepokes/lang/is/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/is/strings.php
rename to sources/addon/morepokes/lang/is/strings.php
diff --git a/sources/addons/morepokes/lang/it/messages.po b/sources/addon/morepokes/lang/it/messages.po
similarity index 100%
rename from sources/addons/morepokes/lang/it/messages.po
rename to sources/addon/morepokes/lang/it/messages.po
diff --git a/sources/addons/morepokes/lang/it/strings.php b/sources/addon/morepokes/lang/it/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/it/strings.php
rename to sources/addon/morepokes/lang/it/strings.php
diff --git a/sources/addons/morepokes/lang/nb-no/strings.php b/sources/addon/morepokes/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/nb-no/strings.php
rename to sources/addon/morepokes/lang/nb-no/strings.php
diff --git a/sources/addons/morepokes/lang/pl/strings.php b/sources/addon/morepokes/lang/pl/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/pl/strings.php
rename to sources/addon/morepokes/lang/pl/strings.php
diff --git a/sources/addons/morepokes/lang/pt-br/strings.php b/sources/addon/morepokes/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/pt-br/strings.php
rename to sources/addon/morepokes/lang/pt-br/strings.php
diff --git a/sources/addons/morepokes/lang/ro/messages.po b/sources/addon/morepokes/lang/ro/messages.po
similarity index 100%
rename from sources/addons/morepokes/lang/ro/messages.po
rename to sources/addon/morepokes/lang/ro/messages.po
diff --git a/sources/addons/morepokes/lang/ro/strings.php b/sources/addon/morepokes/lang/ro/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/ro/strings.php
rename to sources/addon/morepokes/lang/ro/strings.php
diff --git a/sources/addons/morepokes/lang/ru/strings.php b/sources/addon/morepokes/lang/ru/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/ru/strings.php
rename to sources/addon/morepokes/lang/ru/strings.php
diff --git a/sources/addons/morepokes/lang/sv/strings.php b/sources/addon/morepokes/lang/sv/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/sv/strings.php
rename to sources/addon/morepokes/lang/sv/strings.php
diff --git a/sources/addons/morepokes/lang/zh-cn/strings.php b/sources/addon/morepokes/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/morepokes/lang/zh-cn/strings.php
rename to sources/addon/morepokes/lang/zh-cn/strings.php
diff --git a/sources/addons/morepokes/morepokes.php b/sources/addon/morepokes/morepokes.php
similarity index 100%
rename from sources/addons/morepokes/morepokes.php
rename to sources/addon/morepokes/morepokes.php
diff --git a/sources/addons/msgfooter/msgfooter.php b/sources/addon/msgfooter/msgfooter.php
similarity index 100%
rename from sources/addons/msgfooter/msgfooter.php
rename to sources/addon/msgfooter/msgfooter.php
diff --git a/sources/addons/msgfooter/view/tpl/admin.tpl b/sources/addon/msgfooter/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/msgfooter/view/tpl/admin.tpl
rename to sources/addon/msgfooter/view/tpl/admin.tpl
diff --git a/sources/addons/noembed/noembed.php b/sources/addon/noembed/noembed.php
similarity index 100%
rename from sources/addons/noembed/noembed.php
rename to sources/addon/noembed/noembed.php
diff --git a/sources/addons/nofed/nofed.css b/sources/addon/nofed/nofed.css
similarity index 100%
rename from sources/addons/nofed/nofed.css
rename to sources/addon/nofed/nofed.css
diff --git a/sources/addons/nofed/nofed.php b/sources/addon/nofed/nofed.php
similarity index 100%
rename from sources/addons/nofed/nofed.php
rename to sources/addon/nofed/nofed.php
diff --git a/sources/addons/nofed/rhash-32.png b/sources/addon/nofed/rhash-32.png
similarity index 100%
rename from sources/addons/nofed/rhash-32.png
rename to sources/addon/nofed/rhash-32.png
diff --git a/sources/addons/nsabait/nsabait.css b/sources/addon/nsabait/nsabait.css
similarity index 100%
rename from sources/addons/nsabait/nsabait.css
rename to sources/addon/nsabait/nsabait.css
diff --git a/sources/addons/nsabait/nsabait.php b/sources/addon/nsabait/nsabait.php
similarity index 100%
rename from sources/addons/nsabait/nsabait.php
rename to sources/addon/nsabait/nsabait.php
diff --git a/sources/addons/nsabait/wordlist.txt b/sources/addon/nsabait/wordlist.txt
similarity index 100%
rename from sources/addons/nsabait/wordlist.txt
rename to sources/addon/nsabait/wordlist.txt
diff --git a/sources/addons/nsabait/words.txt b/sources/addon/nsabait/words.txt
similarity index 100%
rename from sources/addons/nsabait/words.txt
rename to sources/addon/nsabait/words.txt
diff --git a/sources/addons/nsfw/README b/sources/addon/nsfw/README
similarity index 100%
rename from sources/addons/nsfw/README
rename to sources/addon/nsfw/README
diff --git a/sources/addons/nsfw/lang/C/messages.po b/sources/addon/nsfw/lang/C/messages.po
similarity index 100%
rename from sources/addons/nsfw/lang/C/messages.po
rename to sources/addon/nsfw/lang/C/messages.po
diff --git a/sources/addons/nsfw/lang/ca/strings.php b/sources/addon/nsfw/lang/ca/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/ca/strings.php
rename to sources/addon/nsfw/lang/ca/strings.php
diff --git a/sources/addons/nsfw/lang/cs/strings.php b/sources/addon/nsfw/lang/cs/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/cs/strings.php
rename to sources/addon/nsfw/lang/cs/strings.php
diff --git a/sources/addons/nsfw/lang/de/strings.php b/sources/addon/nsfw/lang/de/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/de/strings.php
rename to sources/addon/nsfw/lang/de/strings.php
diff --git a/sources/addons/nsfw/lang/eo/strings.php b/sources/addon/nsfw/lang/eo/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/eo/strings.php
rename to sources/addon/nsfw/lang/eo/strings.php
diff --git a/sources/addons/nsfw/lang/es/strings.php b/sources/addon/nsfw/lang/es/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/es/strings.php
rename to sources/addon/nsfw/lang/es/strings.php
diff --git a/sources/addons/nsfw/lang/fr/strings.php b/sources/addon/nsfw/lang/fr/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/fr/strings.php
rename to sources/addon/nsfw/lang/fr/strings.php
diff --git a/sources/addons/nsfw/lang/is/strings.php b/sources/addon/nsfw/lang/is/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/is/strings.php
rename to sources/addon/nsfw/lang/is/strings.php
diff --git a/sources/addons/nsfw/lang/it/strings.php b/sources/addon/nsfw/lang/it/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/it/strings.php
rename to sources/addon/nsfw/lang/it/strings.php
diff --git a/sources/addons/nsfw/lang/nb-no/strings.php b/sources/addon/nsfw/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/nb-no/strings.php
rename to sources/addon/nsfw/lang/nb-no/strings.php
diff --git a/sources/addons/nsfw/lang/nl/strings.php b/sources/addon/nsfw/lang/nl/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/nl/strings.php
rename to sources/addon/nsfw/lang/nl/strings.php
diff --git a/sources/addons/nsfw/lang/pl/strings.php b/sources/addon/nsfw/lang/pl/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/pl/strings.php
rename to sources/addon/nsfw/lang/pl/strings.php
diff --git a/sources/addons/nsfw/lang/pt-br/strings.php b/sources/addon/nsfw/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/pt-br/strings.php
rename to sources/addon/nsfw/lang/pt-br/strings.php
diff --git a/sources/addons/nsfw/lang/ru/strings.php b/sources/addon/nsfw/lang/ru/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/ru/strings.php
rename to sources/addon/nsfw/lang/ru/strings.php
diff --git a/sources/addons/nsfw/lang/sv/strings.php b/sources/addon/nsfw/lang/sv/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/sv/strings.php
rename to sources/addon/nsfw/lang/sv/strings.php
diff --git a/sources/addons/nsfw/lang/zh-cn/strings.php b/sources/addon/nsfw/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/nsfw/lang/zh-cn/strings.php
rename to sources/addon/nsfw/lang/zh-cn/strings.php
diff --git a/sources/addons/nsfw/nsfw.css b/sources/addon/nsfw/nsfw.css
similarity index 100%
rename from sources/addons/nsfw/nsfw.css
rename to sources/addon/nsfw/nsfw.css
diff --git a/sources/addons/nsfw/nsfw.php b/sources/addon/nsfw/nsfw.php
similarity index 100%
rename from sources/addons/nsfw/nsfw.php
rename to sources/addon/nsfw/nsfw.php
diff --git a/sources/addons/openclipatar/openclipart-banner.png b/sources/addon/openclipatar/openclipart-banner.png
similarity index 100%
rename from sources/addons/openclipatar/openclipart-banner.png
rename to sources/addon/openclipatar/openclipart-banner.png
diff --git a/sources/addons/openclipatar/openclipatar.css b/sources/addon/openclipatar/openclipatar.css
similarity index 100%
rename from sources/addons/openclipatar/openclipatar.css
rename to sources/addon/openclipatar/openclipatar.css
diff --git a/sources/addons/openclipatar/openclipatar.php b/sources/addon/openclipatar/openclipatar.php
similarity index 100%
rename from sources/addons/openclipatar/openclipatar.php
rename to sources/addon/openclipatar/openclipatar.php
diff --git a/sources/addons/openclipatar/view/tpl/admin.tpl b/sources/addon/openclipatar/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/openclipatar/view/tpl/admin.tpl
rename to sources/addon/openclipatar/view/tpl/admin.tpl
diff --git a/sources/addons/openclipatar/view/tpl/avatar-ajax.tpl b/sources/addon/openclipatar/view/tpl/avatar-ajax.tpl
similarity index 100%
rename from sources/addons/openclipatar/view/tpl/avatar-ajax.tpl
rename to sources/addon/openclipatar/view/tpl/avatar-ajax.tpl
diff --git a/sources/addons/openclipatar/view/tpl/avatar-entry.tpl b/sources/addon/openclipatar/view/tpl/avatar-entry.tpl
similarity index 100%
rename from sources/addons/openclipatar/view/tpl/avatar-entry.tpl
rename to sources/addon/openclipatar/view/tpl/avatar-entry.tpl
diff --git a/sources/addons/openclipatar/view/tpl/avatars.tpl b/sources/addon/openclipatar/view/tpl/avatars.tpl
similarity index 100%
rename from sources/addons/openclipatar/view/tpl/avatars.tpl
rename to sources/addon/openclipatar/view/tpl/avatars.tpl
diff --git a/sources/addons/openstreetmap/README.md b/sources/addon/openstreetmap/README.md
similarity index 100%
rename from sources/addons/openstreetmap/README.md
rename to sources/addon/openstreetmap/README.md
diff --git a/sources/addons/openstreetmap/lang/C/messages.po b/sources/addon/openstreetmap/lang/C/messages.po
similarity index 100%
rename from sources/addons/openstreetmap/lang/C/messages.po
rename to sources/addon/openstreetmap/lang/C/messages.po
diff --git a/sources/addons/openstreetmap/lang/ca/strings.php b/sources/addon/openstreetmap/lang/ca/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/ca/strings.php
rename to sources/addon/openstreetmap/lang/ca/strings.php
diff --git a/sources/addons/openstreetmap/lang/cs/strings.php b/sources/addon/openstreetmap/lang/cs/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/cs/strings.php
rename to sources/addon/openstreetmap/lang/cs/strings.php
diff --git a/sources/addons/openstreetmap/lang/de/strings.php b/sources/addon/openstreetmap/lang/de/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/de/strings.php
rename to sources/addon/openstreetmap/lang/de/strings.php
diff --git a/sources/addons/openstreetmap/lang/eo/strings.php b/sources/addon/openstreetmap/lang/eo/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/eo/strings.php
rename to sources/addon/openstreetmap/lang/eo/strings.php
diff --git a/sources/addons/openstreetmap/lang/es/strings.php b/sources/addon/openstreetmap/lang/es/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/es/strings.php
rename to sources/addon/openstreetmap/lang/es/strings.php
diff --git a/sources/addons/openstreetmap/lang/fr/strings.php b/sources/addon/openstreetmap/lang/fr/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/fr/strings.php
rename to sources/addon/openstreetmap/lang/fr/strings.php
diff --git a/sources/addons/openstreetmap/lang/is/strings.php b/sources/addon/openstreetmap/lang/is/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/is/strings.php
rename to sources/addon/openstreetmap/lang/is/strings.php
diff --git a/sources/addons/openstreetmap/lang/it/strings.php b/sources/addon/openstreetmap/lang/it/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/it/strings.php
rename to sources/addon/openstreetmap/lang/it/strings.php
diff --git a/sources/addons/openstreetmap/lang/nb-no/strings.php b/sources/addon/openstreetmap/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/nb-no/strings.php
rename to sources/addon/openstreetmap/lang/nb-no/strings.php
diff --git a/sources/addons/openstreetmap/lang/nl/strings.php b/sources/addon/openstreetmap/lang/nl/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/nl/strings.php
rename to sources/addon/openstreetmap/lang/nl/strings.php
diff --git a/sources/addons/openstreetmap/lang/pl/strings.php b/sources/addon/openstreetmap/lang/pl/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/pl/strings.php
rename to sources/addon/openstreetmap/lang/pl/strings.php
diff --git a/sources/addons/openstreetmap/lang/pt-br/strings.php b/sources/addon/openstreetmap/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/pt-br/strings.php
rename to sources/addon/openstreetmap/lang/pt-br/strings.php
diff --git a/sources/addons/openstreetmap/lang/ru/strings.php b/sources/addon/openstreetmap/lang/ru/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/ru/strings.php
rename to sources/addon/openstreetmap/lang/ru/strings.php
diff --git a/sources/addons/openstreetmap/lang/sv/strings.php b/sources/addon/openstreetmap/lang/sv/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/sv/strings.php
rename to sources/addon/openstreetmap/lang/sv/strings.php
diff --git a/sources/addons/openstreetmap/lang/zh-cn/strings.php b/sources/addon/openstreetmap/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/openstreetmap/lang/zh-cn/strings.php
rename to sources/addon/openstreetmap/lang/zh-cn/strings.php
diff --git a/sources/addons/openstreetmap/openstreetmap.js b/sources/addon/openstreetmap/openstreetmap.js
similarity index 100%
rename from sources/addons/openstreetmap/openstreetmap.js
rename to sources/addon/openstreetmap/openstreetmap.js
diff --git a/sources/addons/openstreetmap/openstreetmap.php b/sources/addon/openstreetmap/openstreetmap.php
similarity index 100%
rename from sources/addons/openstreetmap/openstreetmap.php
rename to sources/addon/openstreetmap/openstreetmap.php
diff --git a/sources/addons/openstreetmap/view/tpl/admin.tpl b/sources/addon/openstreetmap/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/openstreetmap/view/tpl/admin.tpl
rename to sources/addon/openstreetmap/view/tpl/admin.tpl
diff --git a/sources/addons/pageheader/README b/sources/addon/pageheader/README
similarity index 100%
rename from sources/addons/pageheader/README
rename to sources/addon/pageheader/README
diff --git a/sources/addons/pageheader/lang/C/messages.po b/sources/addon/pageheader/lang/C/messages.po
similarity index 100%
rename from sources/addons/pageheader/lang/C/messages.po
rename to sources/addon/pageheader/lang/C/messages.po
diff --git a/sources/addons/pageheader/lang/ca/strings.php b/sources/addon/pageheader/lang/ca/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/ca/strings.php
rename to sources/addon/pageheader/lang/ca/strings.php
diff --git a/sources/addons/pageheader/lang/cs/messages.po b/sources/addon/pageheader/lang/cs/messages.po
similarity index 100%
rename from sources/addons/pageheader/lang/cs/messages.po
rename to sources/addon/pageheader/lang/cs/messages.po
diff --git a/sources/addons/pageheader/lang/cs/strings.php b/sources/addon/pageheader/lang/cs/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/cs/strings.php
rename to sources/addon/pageheader/lang/cs/strings.php
diff --git a/sources/addons/pageheader/lang/de/messages.po b/sources/addon/pageheader/lang/de/messages.po
similarity index 100%
rename from sources/addons/pageheader/lang/de/messages.po
rename to sources/addon/pageheader/lang/de/messages.po
diff --git a/sources/addons/pageheader/lang/de/strings.php b/sources/addon/pageheader/lang/de/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/de/strings.php
rename to sources/addon/pageheader/lang/de/strings.php
diff --git a/sources/addons/pageheader/lang/eo/strings.php b/sources/addon/pageheader/lang/eo/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/eo/strings.php
rename to sources/addon/pageheader/lang/eo/strings.php
diff --git a/sources/addons/pageheader/lang/es/strings.php b/sources/addon/pageheader/lang/es/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/es/strings.php
rename to sources/addon/pageheader/lang/es/strings.php
diff --git a/sources/addons/pageheader/lang/fr/strings.php b/sources/addon/pageheader/lang/fr/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/fr/strings.php
rename to sources/addon/pageheader/lang/fr/strings.php
diff --git a/sources/addons/pageheader/lang/is/strings.php b/sources/addon/pageheader/lang/is/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/is/strings.php
rename to sources/addon/pageheader/lang/is/strings.php
diff --git a/sources/addons/pageheader/lang/it/messages.po b/sources/addon/pageheader/lang/it/messages.po
similarity index 100%
rename from sources/addons/pageheader/lang/it/messages.po
rename to sources/addon/pageheader/lang/it/messages.po
diff --git a/sources/addons/pageheader/lang/it/strings.php b/sources/addon/pageheader/lang/it/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/it/strings.php
rename to sources/addon/pageheader/lang/it/strings.php
diff --git a/sources/addons/pageheader/lang/nb-no/strings.php b/sources/addon/pageheader/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/nb-no/strings.php
rename to sources/addon/pageheader/lang/nb-no/strings.php
diff --git a/sources/addons/pageheader/lang/nl/strings.php b/sources/addon/pageheader/lang/nl/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/nl/strings.php
rename to sources/addon/pageheader/lang/nl/strings.php
diff --git a/sources/addons/pageheader/lang/pl/strings.php b/sources/addon/pageheader/lang/pl/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/pl/strings.php
rename to sources/addon/pageheader/lang/pl/strings.php
diff --git a/sources/addons/pageheader/lang/pt-br/strings.php b/sources/addon/pageheader/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/pt-br/strings.php
rename to sources/addon/pageheader/lang/pt-br/strings.php
diff --git a/sources/addons/pageheader/lang/ro/messages.po b/sources/addon/pageheader/lang/ro/messages.po
similarity index 100%
rename from sources/addons/pageheader/lang/ro/messages.po
rename to sources/addon/pageheader/lang/ro/messages.po
diff --git a/sources/addons/pageheader/lang/ro/strings.php b/sources/addon/pageheader/lang/ro/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/ro/strings.php
rename to sources/addon/pageheader/lang/ro/strings.php
diff --git a/sources/addons/pageheader/lang/ru/strings.php b/sources/addon/pageheader/lang/ru/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/ru/strings.php
rename to sources/addon/pageheader/lang/ru/strings.php
diff --git a/sources/addons/pageheader/lang/sv/strings.php b/sources/addon/pageheader/lang/sv/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/sv/strings.php
rename to sources/addon/pageheader/lang/sv/strings.php
diff --git a/sources/addons/pageheader/lang/zh-cn/strings.php b/sources/addon/pageheader/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/pageheader/lang/zh-cn/strings.php
rename to sources/addon/pageheader/lang/zh-cn/strings.php
diff --git a/sources/addons/pageheader/pageheader.css b/sources/addon/pageheader/pageheader.css
similarity index 100%
rename from sources/addons/pageheader/pageheader.css
rename to sources/addon/pageheader/pageheader.css
diff --git a/sources/addons/pageheader/pageheader.php b/sources/addon/pageheader/pageheader.php
similarity index 100%
rename from sources/addons/pageheader/pageheader.php
rename to sources/addon/pageheader/pageheader.php
diff --git a/sources/addons/piwik/LICENSE b/sources/addon/piwik/LICENSE
similarity index 100%
rename from sources/addons/piwik/LICENSE
rename to sources/addon/piwik/LICENSE
diff --git a/sources/addons/piwik/README.md b/sources/addon/piwik/README.md
similarity index 100%
rename from sources/addons/piwik/README.md
rename to sources/addon/piwik/README.md
diff --git a/sources/addons/piwik/lang/C/messages.po b/sources/addon/piwik/lang/C/messages.po
similarity index 100%
rename from sources/addons/piwik/lang/C/messages.po
rename to sources/addon/piwik/lang/C/messages.po
diff --git a/sources/addons/piwik/lang/ca/strings.php b/sources/addon/piwik/lang/ca/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/ca/strings.php
rename to sources/addon/piwik/lang/ca/strings.php
diff --git a/sources/addons/piwik/lang/cs/strings.php b/sources/addon/piwik/lang/cs/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/cs/strings.php
rename to sources/addon/piwik/lang/cs/strings.php
diff --git a/sources/addons/piwik/lang/de/strings.php b/sources/addon/piwik/lang/de/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/de/strings.php
rename to sources/addon/piwik/lang/de/strings.php
diff --git a/sources/addons/piwik/lang/eo/strings.php b/sources/addon/piwik/lang/eo/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/eo/strings.php
rename to sources/addon/piwik/lang/eo/strings.php
diff --git a/sources/addons/piwik/lang/es/strings.php b/sources/addon/piwik/lang/es/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/es/strings.php
rename to sources/addon/piwik/lang/es/strings.php
diff --git a/sources/addons/piwik/lang/fr/strings.php b/sources/addon/piwik/lang/fr/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/fr/strings.php
rename to sources/addon/piwik/lang/fr/strings.php
diff --git a/sources/addons/piwik/lang/is/strings.php b/sources/addon/piwik/lang/is/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/is/strings.php
rename to sources/addon/piwik/lang/is/strings.php
diff --git a/sources/addons/piwik/lang/it/strings.php b/sources/addon/piwik/lang/it/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/it/strings.php
rename to sources/addon/piwik/lang/it/strings.php
diff --git a/sources/addons/piwik/lang/nb-no/strings.php b/sources/addon/piwik/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/nb-no/strings.php
rename to sources/addon/piwik/lang/nb-no/strings.php
diff --git a/sources/addons/piwik/lang/pl/strings.php b/sources/addon/piwik/lang/pl/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/pl/strings.php
rename to sources/addon/piwik/lang/pl/strings.php
diff --git a/sources/addons/piwik/lang/pt-br/strings.php b/sources/addon/piwik/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/pt-br/strings.php
rename to sources/addon/piwik/lang/pt-br/strings.php
diff --git a/sources/addons/piwik/lang/ru/strings.php b/sources/addon/piwik/lang/ru/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/ru/strings.php
rename to sources/addon/piwik/lang/ru/strings.php
diff --git a/sources/addons/piwik/lang/sv/strings.php b/sources/addon/piwik/lang/sv/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/sv/strings.php
rename to sources/addon/piwik/lang/sv/strings.php
diff --git a/sources/addons/piwik/lang/zh-cn/strings.php b/sources/addon/piwik/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/piwik/lang/zh-cn/strings.php
rename to sources/addon/piwik/lang/zh-cn/strings.php
diff --git a/sources/addons/piwik/piwik.css b/sources/addon/piwik/piwik.css
similarity index 100%
rename from sources/addons/piwik/piwik.css
rename to sources/addon/piwik/piwik.css
diff --git a/sources/addons/piwik/piwik.php b/sources/addon/piwik/piwik.php
similarity index 100%
rename from sources/addons/piwik/piwik.php
rename to sources/addon/piwik/piwik.php
diff --git a/sources/addons/piwik/view/tpl/admin.tpl b/sources/addon/piwik/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/piwik/view/tpl/admin.tpl
rename to sources/addon/piwik/view/tpl/admin.tpl
diff --git a/sources/addons/planets/planets.css b/sources/addon/planets/planets.css
similarity index 100%
rename from sources/addons/planets/planets.css
rename to sources/addon/planets/planets.css
diff --git a/sources/addons/planets/planets.php b/sources/addon/planets/planets.php
similarity index 100%
rename from sources/addons/planets/planets.php
rename to sources/addon/planets/planets.php
diff --git a/sources/addons/pubsubhubbub/pubsub.php b/sources/addon/pubsubhubbub/pubsub.php
similarity index 100%
rename from sources/addons/pubsubhubbub/pubsub.php
rename to sources/addon/pubsubhubbub/pubsub.php
diff --git a/sources/addons/pubsubhubbub/pubsubhubbub.php b/sources/addon/pubsubhubbub/pubsubhubbub.php
similarity index 100%
rename from sources/addons/pubsubhubbub/pubsubhubbub.php
rename to sources/addon/pubsubhubbub/pubsubhubbub.php
diff --git a/sources/addons/pumpio/pumpio.css b/sources/addon/pumpio/pumpio.css
similarity index 100%
rename from sources/addons/pumpio/pumpio.css
rename to sources/addon/pumpio/pumpio.css
diff --git a/sources/addons/pumpio/pumpio.php b/sources/addon/pumpio/pumpio.php
similarity index 100%
rename from sources/addons/pumpio/pumpio.php
rename to sources/addon/pumpio/pumpio.php
diff --git a/sources/addons/pumpio/pumpio.png b/sources/addon/pumpio/pumpio.png
similarity index 100%
rename from sources/addons/pumpio/pumpio.png
rename to sources/addon/pumpio/pumpio.png
diff --git a/sources/addons/qrator/phpqrcode/CHANGELOG b/sources/addon/qrator/phpqrcode/CHANGELOG
similarity index 100%
rename from sources/addons/qrator/phpqrcode/CHANGELOG
rename to sources/addon/qrator/phpqrcode/CHANGELOG
diff --git a/sources/addons/qrator/phpqrcode/INSTALL b/sources/addon/qrator/phpqrcode/INSTALL
similarity index 100%
rename from sources/addons/qrator/phpqrcode/INSTALL
rename to sources/addon/qrator/phpqrcode/INSTALL
diff --git a/sources/addons/qrator/phpqrcode/LICENSE b/sources/addon/qrator/phpqrcode/LICENSE
similarity index 100%
rename from sources/addons/qrator/phpqrcode/LICENSE
rename to sources/addon/qrator/phpqrcode/LICENSE
diff --git a/sources/addons/qrator/phpqrcode/README b/sources/addon/qrator/phpqrcode/README
similarity index 100%
rename from sources/addons/qrator/phpqrcode/README
rename to sources/addon/qrator/phpqrcode/README
diff --git a/sources/addons/qrator/phpqrcode/VERSION b/sources/addon/qrator/phpqrcode/VERSION
similarity index 100%
rename from sources/addons/qrator/phpqrcode/VERSION
rename to sources/addon/qrator/phpqrcode/VERSION
diff --git a/sources/addons/qrator/phpqrcode/bindings/tcpdf/qrcode.php b/sources/addon/qrator/phpqrcode/bindings/tcpdf/qrcode.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/bindings/tcpdf/qrcode.php
rename to sources/addon/qrator/phpqrcode/bindings/tcpdf/qrcode.php
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_1.dat b/sources/addon/qrator/phpqrcode/cache/frame_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_1.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_1.png b/sources/addon/qrator/phpqrcode/cache/frame_1.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_1.png
rename to sources/addon/qrator/phpqrcode/cache/frame_1.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_10.dat b/sources/addon/qrator/phpqrcode/cache/frame_10.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_10.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_10.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_10.png b/sources/addon/qrator/phpqrcode/cache/frame_10.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_10.png
rename to sources/addon/qrator/phpqrcode/cache/frame_10.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_11.dat b/sources/addon/qrator/phpqrcode/cache/frame_11.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_11.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_11.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_11.png b/sources/addon/qrator/phpqrcode/cache/frame_11.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_11.png
rename to sources/addon/qrator/phpqrcode/cache/frame_11.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_12.dat b/sources/addon/qrator/phpqrcode/cache/frame_12.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_12.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_12.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_12.png b/sources/addon/qrator/phpqrcode/cache/frame_12.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_12.png
rename to sources/addon/qrator/phpqrcode/cache/frame_12.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_13.dat b/sources/addon/qrator/phpqrcode/cache/frame_13.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_13.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_13.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_13.png b/sources/addon/qrator/phpqrcode/cache/frame_13.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_13.png
rename to sources/addon/qrator/phpqrcode/cache/frame_13.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_14.dat b/sources/addon/qrator/phpqrcode/cache/frame_14.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_14.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_14.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_14.png b/sources/addon/qrator/phpqrcode/cache/frame_14.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_14.png
rename to sources/addon/qrator/phpqrcode/cache/frame_14.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_15.dat b/sources/addon/qrator/phpqrcode/cache/frame_15.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_15.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_15.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_15.png b/sources/addon/qrator/phpqrcode/cache/frame_15.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_15.png
rename to sources/addon/qrator/phpqrcode/cache/frame_15.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_16.dat b/sources/addon/qrator/phpqrcode/cache/frame_16.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_16.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_16.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_16.png b/sources/addon/qrator/phpqrcode/cache/frame_16.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_16.png
rename to sources/addon/qrator/phpqrcode/cache/frame_16.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_17.dat b/sources/addon/qrator/phpqrcode/cache/frame_17.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_17.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_17.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_17.png b/sources/addon/qrator/phpqrcode/cache/frame_17.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_17.png
rename to sources/addon/qrator/phpqrcode/cache/frame_17.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_18.dat b/sources/addon/qrator/phpqrcode/cache/frame_18.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_18.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_18.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_18.png b/sources/addon/qrator/phpqrcode/cache/frame_18.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_18.png
rename to sources/addon/qrator/phpqrcode/cache/frame_18.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_19.dat b/sources/addon/qrator/phpqrcode/cache/frame_19.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_19.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_19.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_19.png b/sources/addon/qrator/phpqrcode/cache/frame_19.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_19.png
rename to sources/addon/qrator/phpqrcode/cache/frame_19.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_2.dat b/sources/addon/qrator/phpqrcode/cache/frame_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_2.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_2.png b/sources/addon/qrator/phpqrcode/cache/frame_2.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_2.png
rename to sources/addon/qrator/phpqrcode/cache/frame_2.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_20.dat b/sources/addon/qrator/phpqrcode/cache/frame_20.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_20.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_20.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_20.png b/sources/addon/qrator/phpqrcode/cache/frame_20.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_20.png
rename to sources/addon/qrator/phpqrcode/cache/frame_20.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_21.dat b/sources/addon/qrator/phpqrcode/cache/frame_21.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_21.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_21.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_21.png b/sources/addon/qrator/phpqrcode/cache/frame_21.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_21.png
rename to sources/addon/qrator/phpqrcode/cache/frame_21.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_22.dat b/sources/addon/qrator/phpqrcode/cache/frame_22.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_22.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_22.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_22.png b/sources/addon/qrator/phpqrcode/cache/frame_22.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_22.png
rename to sources/addon/qrator/phpqrcode/cache/frame_22.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_23.dat b/sources/addon/qrator/phpqrcode/cache/frame_23.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_23.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_23.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_23.png b/sources/addon/qrator/phpqrcode/cache/frame_23.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_23.png
rename to sources/addon/qrator/phpqrcode/cache/frame_23.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_24.dat b/sources/addon/qrator/phpqrcode/cache/frame_24.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_24.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_24.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_24.png b/sources/addon/qrator/phpqrcode/cache/frame_24.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_24.png
rename to sources/addon/qrator/phpqrcode/cache/frame_24.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_25.dat b/sources/addon/qrator/phpqrcode/cache/frame_25.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_25.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_25.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_25.png b/sources/addon/qrator/phpqrcode/cache/frame_25.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_25.png
rename to sources/addon/qrator/phpqrcode/cache/frame_25.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_26.dat b/sources/addon/qrator/phpqrcode/cache/frame_26.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_26.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_26.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_26.png b/sources/addon/qrator/phpqrcode/cache/frame_26.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_26.png
rename to sources/addon/qrator/phpqrcode/cache/frame_26.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_27.dat b/sources/addon/qrator/phpqrcode/cache/frame_27.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_27.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_27.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_27.png b/sources/addon/qrator/phpqrcode/cache/frame_27.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_27.png
rename to sources/addon/qrator/phpqrcode/cache/frame_27.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_28.dat b/sources/addon/qrator/phpqrcode/cache/frame_28.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_28.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_28.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_28.png b/sources/addon/qrator/phpqrcode/cache/frame_28.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_28.png
rename to sources/addon/qrator/phpqrcode/cache/frame_28.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_29.dat b/sources/addon/qrator/phpqrcode/cache/frame_29.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_29.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_29.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_29.png b/sources/addon/qrator/phpqrcode/cache/frame_29.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_29.png
rename to sources/addon/qrator/phpqrcode/cache/frame_29.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_3.dat b/sources/addon/qrator/phpqrcode/cache/frame_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_3.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_3.png b/sources/addon/qrator/phpqrcode/cache/frame_3.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_3.png
rename to sources/addon/qrator/phpqrcode/cache/frame_3.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_30.dat b/sources/addon/qrator/phpqrcode/cache/frame_30.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_30.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_30.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_30.png b/sources/addon/qrator/phpqrcode/cache/frame_30.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_30.png
rename to sources/addon/qrator/phpqrcode/cache/frame_30.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_31.dat b/sources/addon/qrator/phpqrcode/cache/frame_31.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_31.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_31.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_31.png b/sources/addon/qrator/phpqrcode/cache/frame_31.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_31.png
rename to sources/addon/qrator/phpqrcode/cache/frame_31.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_32.dat b/sources/addon/qrator/phpqrcode/cache/frame_32.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_32.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_32.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_32.png b/sources/addon/qrator/phpqrcode/cache/frame_32.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_32.png
rename to sources/addon/qrator/phpqrcode/cache/frame_32.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_33.dat b/sources/addon/qrator/phpqrcode/cache/frame_33.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_33.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_33.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_33.png b/sources/addon/qrator/phpqrcode/cache/frame_33.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_33.png
rename to sources/addon/qrator/phpqrcode/cache/frame_33.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_34.dat b/sources/addon/qrator/phpqrcode/cache/frame_34.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_34.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_34.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_34.png b/sources/addon/qrator/phpqrcode/cache/frame_34.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_34.png
rename to sources/addon/qrator/phpqrcode/cache/frame_34.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_35.dat b/sources/addon/qrator/phpqrcode/cache/frame_35.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_35.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_35.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_35.png b/sources/addon/qrator/phpqrcode/cache/frame_35.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_35.png
rename to sources/addon/qrator/phpqrcode/cache/frame_35.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_36.dat b/sources/addon/qrator/phpqrcode/cache/frame_36.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_36.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_36.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_36.png b/sources/addon/qrator/phpqrcode/cache/frame_36.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_36.png
rename to sources/addon/qrator/phpqrcode/cache/frame_36.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_37.dat b/sources/addon/qrator/phpqrcode/cache/frame_37.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_37.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_37.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_37.png b/sources/addon/qrator/phpqrcode/cache/frame_37.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_37.png
rename to sources/addon/qrator/phpqrcode/cache/frame_37.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_38.dat b/sources/addon/qrator/phpqrcode/cache/frame_38.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_38.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_38.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_38.png b/sources/addon/qrator/phpqrcode/cache/frame_38.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_38.png
rename to sources/addon/qrator/phpqrcode/cache/frame_38.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_39.dat b/sources/addon/qrator/phpqrcode/cache/frame_39.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_39.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_39.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_39.png b/sources/addon/qrator/phpqrcode/cache/frame_39.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_39.png
rename to sources/addon/qrator/phpqrcode/cache/frame_39.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_4.dat b/sources/addon/qrator/phpqrcode/cache/frame_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_4.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_4.png b/sources/addon/qrator/phpqrcode/cache/frame_4.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_4.png
rename to sources/addon/qrator/phpqrcode/cache/frame_4.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_40.dat b/sources/addon/qrator/phpqrcode/cache/frame_40.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_40.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_40.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_40.png b/sources/addon/qrator/phpqrcode/cache/frame_40.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_40.png
rename to sources/addon/qrator/phpqrcode/cache/frame_40.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_5.dat b/sources/addon/qrator/phpqrcode/cache/frame_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_5.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_5.png b/sources/addon/qrator/phpqrcode/cache/frame_5.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_5.png
rename to sources/addon/qrator/phpqrcode/cache/frame_5.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_6.dat b/sources/addon/qrator/phpqrcode/cache/frame_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_6.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_6.png b/sources/addon/qrator/phpqrcode/cache/frame_6.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_6.png
rename to sources/addon/qrator/phpqrcode/cache/frame_6.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_7.dat b/sources/addon/qrator/phpqrcode/cache/frame_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_7.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_7.png b/sources/addon/qrator/phpqrcode/cache/frame_7.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_7.png
rename to sources/addon/qrator/phpqrcode/cache/frame_7.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_8.dat b/sources/addon/qrator/phpqrcode/cache/frame_8.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_8.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_8.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_8.png b/sources/addon/qrator/phpqrcode/cache/frame_8.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_8.png
rename to sources/addon/qrator/phpqrcode/cache/frame_8.png
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_9.dat b/sources/addon/qrator/phpqrcode/cache/frame_9.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_9.dat
rename to sources/addon/qrator/phpqrcode/cache/frame_9.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/frame_9.png b/sources/addon/qrator/phpqrcode/cache/frame_9.png
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/frame_9.png
rename to sources/addon/qrator/phpqrcode/cache/frame_9.png
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_101_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_101_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_101_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_101_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_105_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_105_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_105_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_105_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_109_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_109_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_109_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_109_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_113_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_113_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_113_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_113_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_117_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_117_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_117_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_117_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_121_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_121_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_121_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_121_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_125_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_125_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_125_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_125_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_129_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_129_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_129_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_129_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_133_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_133_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_133_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_133_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_137_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_137_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_137_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_137_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_141_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_141_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_141_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_141_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_145_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_145_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_145_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_145_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_149_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_149_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_149_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_149_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_153_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_153_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_153_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_153_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_157_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_157_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_157_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_157_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_161_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_161_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_161_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_161_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_165_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_165_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_165_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_165_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_169_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_169_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_169_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_169_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_173_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_173_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_173_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_173_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_177_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_177_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_177_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_177_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_21_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_21_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_21_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_21_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_25_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_25_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_25_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_25_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_29_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_29_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_29_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_29_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_33_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_33_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_33_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_33_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_37_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_37_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_37_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_37_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_41_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_41_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_41_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_41_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_45_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_45_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_45_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_45_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_49_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_49_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_49_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_49_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_53_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_53_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_53_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_53_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_57_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_57_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_57_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_57_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_61_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_61_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_61_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_61_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_65_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_65_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_65_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_65_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_69_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_69_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_69_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_69_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_73_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_73_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_73_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_73_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_77_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_77_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_77_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_77_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_81_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_81_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_81_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_81_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_85_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_85_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_85_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_85_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_89_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_89_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_89_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_89_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_93_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_93_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_93_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_93_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_0/mask_97_0.dat b/sources/addon/qrator/phpqrcode/cache/mask_0/mask_97_0.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_0/mask_97_0.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_0/mask_97_0.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_101_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_101_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_101_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_101_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_105_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_105_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_105_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_105_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_109_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_109_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_109_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_109_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_113_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_113_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_113_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_113_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_117_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_117_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_117_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_117_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_121_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_121_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_121_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_121_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_125_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_125_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_125_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_125_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_129_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_129_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_129_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_129_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_133_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_133_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_133_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_133_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_137_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_137_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_137_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_137_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_141_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_141_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_141_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_141_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_145_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_145_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_145_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_145_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_149_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_149_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_149_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_149_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_153_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_153_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_153_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_153_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_157_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_157_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_157_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_157_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_161_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_161_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_161_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_161_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_165_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_165_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_165_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_165_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_169_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_169_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_169_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_169_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_173_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_173_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_173_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_173_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_177_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_177_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_177_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_177_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_21_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_21_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_21_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_21_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_25_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_25_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_25_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_25_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_29_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_29_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_29_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_29_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_33_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_33_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_33_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_33_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_37_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_37_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_37_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_37_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_41_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_41_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_41_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_41_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_45_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_45_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_45_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_45_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_49_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_49_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_49_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_49_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_53_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_53_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_53_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_53_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_57_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_57_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_57_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_57_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_61_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_61_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_61_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_61_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_65_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_65_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_65_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_65_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_69_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_69_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_69_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_69_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_73_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_73_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_73_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_73_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_77_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_77_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_77_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_77_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_81_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_81_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_81_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_81_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_85_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_85_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_85_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_85_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_89_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_89_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_89_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_89_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_93_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_93_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_93_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_93_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_1/mask_97_1.dat b/sources/addon/qrator/phpqrcode/cache/mask_1/mask_97_1.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_1/mask_97_1.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_1/mask_97_1.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_101_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_101_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_101_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_101_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_105_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_105_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_105_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_105_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_109_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_109_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_109_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_109_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_113_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_113_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_113_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_113_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_117_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_117_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_117_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_117_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_121_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_121_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_121_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_121_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_125_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_125_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_125_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_125_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_129_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_129_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_129_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_129_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_133_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_133_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_133_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_133_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_137_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_137_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_137_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_137_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_141_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_141_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_141_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_141_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_145_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_145_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_145_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_145_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_149_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_149_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_149_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_149_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_153_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_153_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_153_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_153_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_157_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_157_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_157_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_157_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_161_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_161_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_161_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_161_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_165_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_165_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_165_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_165_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_169_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_169_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_169_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_169_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_173_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_173_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_173_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_173_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_177_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_177_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_177_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_177_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_21_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_21_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_21_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_21_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_25_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_25_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_25_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_25_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_29_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_29_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_29_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_29_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_33_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_33_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_33_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_33_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_37_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_37_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_37_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_37_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_41_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_41_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_41_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_41_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_45_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_45_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_45_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_45_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_49_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_49_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_49_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_49_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_53_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_53_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_53_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_53_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_57_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_57_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_57_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_57_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_61_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_61_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_61_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_61_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_65_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_65_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_65_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_65_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_69_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_69_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_69_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_69_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_73_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_73_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_73_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_73_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_77_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_77_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_77_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_77_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_81_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_81_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_81_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_81_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_85_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_85_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_85_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_85_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_89_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_89_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_89_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_89_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_93_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_93_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_93_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_93_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_2/mask_97_2.dat b/sources/addon/qrator/phpqrcode/cache/mask_2/mask_97_2.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_2/mask_97_2.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_2/mask_97_2.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_101_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_101_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_101_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_101_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_105_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_105_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_105_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_105_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_109_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_109_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_109_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_109_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_113_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_113_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_113_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_113_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_117_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_117_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_117_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_117_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_121_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_121_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_121_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_121_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_125_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_125_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_125_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_125_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_129_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_129_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_129_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_129_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_133_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_133_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_133_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_133_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_137_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_137_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_137_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_137_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_141_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_141_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_141_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_141_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_145_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_145_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_145_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_145_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_149_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_149_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_149_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_149_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_153_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_153_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_153_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_153_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_157_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_157_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_157_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_157_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_161_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_161_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_161_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_161_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_165_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_165_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_165_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_165_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_169_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_169_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_169_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_169_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_173_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_173_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_173_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_173_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_177_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_177_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_177_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_177_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_21_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_21_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_21_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_21_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_25_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_25_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_25_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_25_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_29_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_29_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_29_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_29_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_33_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_33_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_33_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_33_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_37_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_37_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_37_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_37_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_41_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_41_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_41_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_41_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_45_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_45_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_45_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_45_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_49_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_49_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_49_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_49_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_53_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_53_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_53_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_53_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_57_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_57_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_57_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_57_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_61_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_61_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_61_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_61_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_65_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_65_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_65_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_65_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_69_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_69_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_69_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_69_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_73_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_73_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_73_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_73_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_77_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_77_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_77_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_77_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_81_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_81_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_81_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_81_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_85_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_85_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_85_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_85_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_89_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_89_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_89_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_89_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_93_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_93_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_93_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_93_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_3/mask_97_3.dat b/sources/addon/qrator/phpqrcode/cache/mask_3/mask_97_3.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_3/mask_97_3.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_3/mask_97_3.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_101_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_101_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_101_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_101_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_105_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_105_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_105_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_105_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_109_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_109_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_109_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_109_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_113_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_113_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_113_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_113_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_117_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_117_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_117_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_117_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_121_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_121_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_121_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_121_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_125_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_125_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_125_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_125_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_129_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_129_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_129_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_129_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_133_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_133_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_133_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_133_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_137_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_137_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_137_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_137_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_141_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_141_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_141_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_141_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_145_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_145_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_145_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_145_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_149_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_149_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_149_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_149_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_153_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_153_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_153_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_153_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_157_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_157_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_157_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_157_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_161_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_161_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_161_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_161_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_165_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_165_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_165_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_165_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_169_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_169_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_169_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_169_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_173_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_173_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_173_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_173_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_177_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_177_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_177_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_177_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_21_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_21_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_21_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_21_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_25_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_25_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_25_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_25_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_29_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_29_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_29_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_29_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_33_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_33_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_33_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_33_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_37_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_37_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_37_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_37_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_41_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_41_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_41_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_41_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_45_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_45_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_45_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_45_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_49_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_49_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_49_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_49_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_53_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_53_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_53_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_53_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_57_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_57_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_57_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_57_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_61_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_61_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_61_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_61_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_65_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_65_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_65_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_65_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_69_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_69_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_69_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_69_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_73_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_73_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_73_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_73_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_77_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_77_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_77_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_77_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_81_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_81_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_81_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_81_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_85_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_85_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_85_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_85_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_89_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_89_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_89_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_89_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_93_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_93_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_93_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_93_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_4/mask_97_4.dat b/sources/addon/qrator/phpqrcode/cache/mask_4/mask_97_4.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_4/mask_97_4.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_4/mask_97_4.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_101_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_101_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_101_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_101_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_105_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_105_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_105_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_105_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_109_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_109_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_109_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_109_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_113_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_113_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_113_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_113_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_117_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_117_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_117_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_117_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_121_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_121_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_121_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_121_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_125_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_125_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_125_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_125_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_129_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_129_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_129_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_129_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_133_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_133_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_133_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_133_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_137_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_137_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_137_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_137_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_141_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_141_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_141_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_141_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_145_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_145_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_145_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_145_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_149_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_149_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_149_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_149_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_153_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_153_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_153_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_153_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_157_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_157_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_157_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_157_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_161_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_161_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_161_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_161_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_165_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_165_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_165_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_165_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_169_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_169_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_169_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_169_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_173_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_173_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_173_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_173_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_177_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_177_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_177_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_177_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_21_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_21_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_21_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_21_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_25_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_25_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_25_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_25_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_29_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_29_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_29_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_29_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_33_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_33_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_33_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_33_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_37_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_37_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_37_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_37_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_41_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_41_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_41_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_41_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_45_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_45_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_45_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_45_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_49_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_49_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_49_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_49_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_53_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_53_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_53_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_53_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_57_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_57_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_57_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_57_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_61_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_61_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_61_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_61_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_65_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_65_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_65_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_65_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_69_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_69_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_69_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_69_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_73_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_73_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_73_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_73_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_77_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_77_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_77_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_77_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_81_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_81_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_81_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_81_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_85_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_85_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_85_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_85_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_89_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_89_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_89_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_89_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_93_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_93_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_93_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_93_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_5/mask_97_5.dat b/sources/addon/qrator/phpqrcode/cache/mask_5/mask_97_5.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_5/mask_97_5.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_5/mask_97_5.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_101_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_101_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_101_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_101_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_105_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_105_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_105_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_105_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_109_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_109_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_109_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_109_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_113_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_113_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_113_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_113_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_117_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_117_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_117_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_117_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_121_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_121_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_121_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_121_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_125_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_125_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_125_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_125_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_129_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_129_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_129_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_129_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_133_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_133_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_133_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_133_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_137_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_137_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_137_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_137_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_141_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_141_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_141_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_141_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_145_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_145_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_145_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_145_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_149_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_149_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_149_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_149_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_153_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_153_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_153_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_153_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_157_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_157_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_157_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_157_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_161_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_161_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_161_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_161_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_165_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_165_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_165_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_165_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_169_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_169_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_169_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_169_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_173_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_173_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_173_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_173_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_177_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_177_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_177_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_177_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_21_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_21_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_21_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_21_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_25_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_25_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_25_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_25_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_29_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_29_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_29_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_29_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_33_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_33_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_33_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_33_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_37_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_37_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_37_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_37_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_41_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_41_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_41_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_41_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_45_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_45_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_45_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_45_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_49_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_49_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_49_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_49_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_53_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_53_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_53_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_53_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_57_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_57_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_57_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_57_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_61_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_61_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_61_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_61_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_65_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_65_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_65_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_65_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_69_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_69_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_69_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_69_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_73_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_73_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_73_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_73_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_77_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_77_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_77_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_77_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_81_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_81_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_81_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_81_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_85_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_85_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_85_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_85_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_89_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_89_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_89_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_89_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_93_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_93_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_93_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_93_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_6/mask_97_6.dat b/sources/addon/qrator/phpqrcode/cache/mask_6/mask_97_6.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_6/mask_97_6.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_6/mask_97_6.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_101_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_101_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_101_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_101_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_105_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_105_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_105_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_105_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_109_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_109_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_109_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_109_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_113_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_113_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_113_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_113_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_117_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_117_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_117_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_117_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_121_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_121_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_121_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_121_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_125_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_125_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_125_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_125_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_129_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_129_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_129_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_129_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_133_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_133_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_133_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_133_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_137_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_137_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_137_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_137_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_141_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_141_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_141_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_141_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_145_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_145_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_145_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_145_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_149_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_149_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_149_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_149_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_153_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_153_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_153_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_153_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_157_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_157_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_157_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_157_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_161_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_161_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_161_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_161_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_165_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_165_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_165_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_165_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_169_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_169_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_169_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_169_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_173_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_173_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_173_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_173_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_177_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_177_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_177_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_177_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_21_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_21_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_21_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_21_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_25_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_25_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_25_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_25_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_29_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_29_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_29_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_29_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_33_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_33_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_33_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_33_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_37_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_37_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_37_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_37_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_41_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_41_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_41_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_41_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_45_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_45_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_45_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_45_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_49_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_49_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_49_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_49_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_53_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_53_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_53_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_53_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_57_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_57_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_57_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_57_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_61_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_61_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_61_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_61_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_65_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_65_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_65_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_65_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_69_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_69_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_69_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_69_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_73_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_73_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_73_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_73_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_77_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_77_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_77_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_77_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_81_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_81_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_81_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_81_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_85_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_85_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_85_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_85_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_89_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_89_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_89_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_89_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_93_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_93_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_93_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_93_7.dat
diff --git a/sources/addons/qrator/phpqrcode/cache/mask_7/mask_97_7.dat b/sources/addon/qrator/phpqrcode/cache/mask_7/mask_97_7.dat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/cache/mask_7/mask_97_7.dat
rename to sources/addon/qrator/phpqrcode/cache/mask_7/mask_97_7.dat
diff --git a/sources/addons/qrator/phpqrcode/index.php b/sources/addon/qrator/phpqrcode/index.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/index.php
rename to sources/addon/qrator/phpqrcode/index.php
diff --git a/sources/addons/qrator/phpqrcode/phpqrcode.php b/sources/addon/qrator/phpqrcode/phpqrcode.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/phpqrcode.php
rename to sources/addon/qrator/phpqrcode/phpqrcode.php
diff --git a/sources/addons/qrator/phpqrcode/qrbitstream.php b/sources/addon/qrator/phpqrcode/qrbitstream.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrbitstream.php
rename to sources/addon/qrator/phpqrcode/qrbitstream.php
diff --git a/sources/addons/qrator/phpqrcode/qrconfig.php b/sources/addon/qrator/phpqrcode/qrconfig.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrconfig.php
rename to sources/addon/qrator/phpqrcode/qrconfig.php
diff --git a/sources/addons/qrator/phpqrcode/qrconst.php b/sources/addon/qrator/phpqrcode/qrconst.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrconst.php
rename to sources/addon/qrator/phpqrcode/qrconst.php
diff --git a/sources/addons/qrator/phpqrcode/qrencode.php b/sources/addon/qrator/phpqrcode/qrencode.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrencode.php
rename to sources/addon/qrator/phpqrcode/qrencode.php
diff --git a/sources/addons/qrator/phpqrcode/qrimage.php b/sources/addon/qrator/phpqrcode/qrimage.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrimage.php
rename to sources/addon/qrator/phpqrcode/qrimage.php
diff --git a/sources/addons/qrator/phpqrcode/qrinput.php b/sources/addon/qrator/phpqrcode/qrinput.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrinput.php
rename to sources/addon/qrator/phpqrcode/qrinput.php
diff --git a/sources/addons/qrator/phpqrcode/qrlib.php b/sources/addon/qrator/phpqrcode/qrlib.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrlib.php
rename to sources/addon/qrator/phpqrcode/qrlib.php
diff --git a/sources/addons/qrator/phpqrcode/qrmask.php b/sources/addon/qrator/phpqrcode/qrmask.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrmask.php
rename to sources/addon/qrator/phpqrcode/qrmask.php
diff --git a/sources/addons/qrator/phpqrcode/qrrscode.php b/sources/addon/qrator/phpqrcode/qrrscode.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrrscode.php
rename to sources/addon/qrator/phpqrcode/qrrscode.php
diff --git a/sources/addons/qrator/phpqrcode/qrspec.php b/sources/addon/qrator/phpqrcode/qrspec.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrspec.php
rename to sources/addon/qrator/phpqrcode/qrspec.php
diff --git a/sources/addons/qrator/phpqrcode/qrsplit.php b/sources/addon/qrator/phpqrcode/qrsplit.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrsplit.php
rename to sources/addon/qrator/phpqrcode/qrsplit.php
diff --git a/sources/addons/qrator/phpqrcode/qrtools.php b/sources/addon/qrator/phpqrcode/qrtools.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/qrtools.php
rename to sources/addon/qrator/phpqrcode/qrtools.php
diff --git a/sources/addons/qrator/phpqrcode/tools/merge.bat b/sources/addon/qrator/phpqrcode/tools/merge.bat
similarity index 100%
rename from sources/addons/qrator/phpqrcode/tools/merge.bat
rename to sources/addon/qrator/phpqrcode/tools/merge.bat
diff --git a/sources/addons/qrator/phpqrcode/tools/merge.php b/sources/addon/qrator/phpqrcode/tools/merge.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/tools/merge.php
rename to sources/addon/qrator/phpqrcode/tools/merge.php
diff --git a/sources/addons/qrator/phpqrcode/tools/merge.sh b/sources/addon/qrator/phpqrcode/tools/merge.sh
similarity index 100%
rename from sources/addons/qrator/phpqrcode/tools/merge.sh
rename to sources/addon/qrator/phpqrcode/tools/merge.sh
diff --git a/sources/addons/qrator/phpqrcode/tools/merged_config.php b/sources/addon/qrator/phpqrcode/tools/merged_config.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/tools/merged_config.php
rename to sources/addon/qrator/phpqrcode/tools/merged_config.php
diff --git a/sources/addons/qrator/phpqrcode/tools/merged_header.php b/sources/addon/qrator/phpqrcode/tools/merged_header.php
similarity index 100%
rename from sources/addons/qrator/phpqrcode/tools/merged_header.php
rename to sources/addon/qrator/phpqrcode/tools/merged_header.php
diff --git a/sources/addons/qrator/qrator.apd b/sources/addon/qrator/qrator.apd
similarity index 100%
rename from sources/addons/qrator/qrator.apd
rename to sources/addon/qrator/qrator.apd
diff --git a/sources/addons/qrator/qrator.php b/sources/addon/qrator/qrator.php
similarity index 100%
rename from sources/addons/qrator/qrator.php
rename to sources/addon/qrator/qrator.php
diff --git a/sources/addons/qrator/qrator.png b/sources/addon/qrator/qrator.png
similarity index 100%
rename from sources/addons/qrator/qrator.png
rename to sources/addon/qrator/qrator.png
diff --git a/sources/addons/rainbowtag/rainbowtag.css b/sources/addon/rainbowtag/rainbowtag.css
similarity index 100%
rename from sources/addons/rainbowtag/rainbowtag.css
rename to sources/addon/rainbowtag/rainbowtag.css
diff --git a/sources/addons/rainbowtag/rainbowtag.php b/sources/addon/rainbowtag/rainbowtag.php
similarity index 100%
rename from sources/addons/rainbowtag/rainbowtag.php
rename to sources/addon/rainbowtag/rainbowtag.php
diff --git a/sources/addons/randpost/randpost.php b/sources/addon/randpost/randpost.php
similarity index 100%
rename from sources/addons/randpost/randpost.php
rename to sources/addon/randpost/randpost.php
diff --git a/sources/addons/redfiles/redfilehelper.php b/sources/addon/redfiles/redfilehelper.php
similarity index 100%
rename from sources/addons/redfiles/redfilehelper.php
rename to sources/addon/redfiles/redfilehelper.php
diff --git a/sources/addons/redfiles/redfiles.php b/sources/addon/redfiles/redfiles.php
similarity index 100%
rename from sources/addons/redfiles/redfiles.php
rename to sources/addon/redfiles/redfiles.php
diff --git a/sources/addons/redfiles/view/tpl/redfiles.tpl b/sources/addon/redfiles/view/tpl/redfiles.tpl
similarity index 100%
rename from sources/addons/redfiles/view/tpl/redfiles.tpl
rename to sources/addon/redfiles/view/tpl/redfiles.tpl
diff --git a/sources/addons/redphotos/redphotohelper.php b/sources/addon/redphotos/redphotohelper.php
similarity index 100%
rename from sources/addons/redphotos/redphotohelper.php
rename to sources/addon/redphotos/redphotohelper.php
diff --git a/sources/addons/redphotos/redphotos.php b/sources/addon/redphotos/redphotos.php
similarity index 100%
rename from sources/addons/redphotos/redphotos.php
rename to sources/addon/redphotos/redphotos.php
diff --git a/sources/addons/redphotos/view/tpl/redphotos.tpl b/sources/addon/redphotos/view/tpl/redphotos.tpl
similarity index 100%
rename from sources/addons/redphotos/view/tpl/redphotos.tpl
rename to sources/addon/redphotos/view/tpl/redphotos.tpl
diff --git a/sources/addons/redred/redred.css b/sources/addon/redred/redred.css
similarity index 100%
rename from sources/addons/redred/redred.css
rename to sources/addon/redred/redred.css
diff --git a/sources/addons/redred/redred.php b/sources/addon/redred/redred.php
similarity index 100%
rename from sources/addons/redred/redred.php
rename to sources/addon/redred/redred.php
diff --git a/sources/addons/redred/rhash-32.png b/sources/addon/redred/rhash-32.png
similarity index 100%
rename from sources/addons/redred/rhash-32.png
rename to sources/addon/redred/rhash-32.png
diff --git a/sources/addons/rtof/friendica.png b/sources/addon/rtof/friendica.png
similarity index 100%
rename from sources/addons/rtof/friendica.png
rename to sources/addon/rtof/friendica.png
diff --git a/sources/addons/rtof/rtof.css b/sources/addon/rtof/rtof.css
similarity index 100%
rename from sources/addons/rtof/rtof.css
rename to sources/addon/rtof/rtof.css
diff --git a/sources/addons/rtof/rtof.php b/sources/addon/rtof/rtof.php
similarity index 100%
rename from sources/addons/rtof/rtof.php
rename to sources/addon/rtof/rtof.php
diff --git a/sources/addons/sendzid/sendzid.php b/sources/addon/sendzid/sendzid.php
similarity index 100%
rename from sources/addons/sendzid/sendzid.php
rename to sources/addon/sendzid/sendzid.php
diff --git a/sources/addons/skeleton/README.md b/sources/addon/skeleton/README.md
similarity index 100%
rename from sources/addons/skeleton/README.md
rename to sources/addon/skeleton/README.md
diff --git a/sources/addons/skeleton/skeleton.php b/sources/addon/skeleton/skeleton.php
similarity index 100%
rename from sources/addons/skeleton/skeleton.php
rename to sources/addon/skeleton/skeleton.php
diff --git a/sources/addons/smiley_pack/icons/animals/bee.gif b/sources/addon/smiley_pack/icons/animals/bee.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/bee.gif
rename to sources/addon/smiley_pack/icons/animals/bee.gif
diff --git a/sources/addons/smiley_pack/icons/animals/bigspider.gif b/sources/addon/smiley_pack/icons/animals/bigspider.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/bigspider.gif
rename to sources/addon/smiley_pack/icons/animals/bigspider.gif
diff --git a/sources/addons/smiley_pack/icons/animals/bunny.gif b/sources/addon/smiley_pack/icons/animals/bunny.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/bunny.gif
rename to sources/addon/smiley_pack/icons/animals/bunny.gif
diff --git a/sources/addons/smiley_pack/icons/animals/bunnyflowers.gif b/sources/addon/smiley_pack/icons/animals/bunnyflowers.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/bunnyflowers.gif
rename to sources/addon/smiley_pack/icons/animals/bunnyflowers.gif
diff --git a/sources/addons/smiley_pack/icons/animals/cat.gif b/sources/addon/smiley_pack/icons/animals/cat.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/cat.gif
rename to sources/addon/smiley_pack/icons/animals/cat.gif
diff --git a/sources/addons/smiley_pack/icons/animals/chick.gif b/sources/addon/smiley_pack/icons/animals/chick.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/chick.gif
rename to sources/addon/smiley_pack/icons/animals/chick.gif
diff --git a/sources/addons/smiley_pack/icons/animals/cow.gif b/sources/addon/smiley_pack/icons/animals/cow.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/cow.gif
rename to sources/addon/smiley_pack/icons/animals/cow.gif
diff --git a/sources/addons/smiley_pack/icons/animals/crab.gif b/sources/addon/smiley_pack/icons/animals/crab.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/crab.gif
rename to sources/addon/smiley_pack/icons/animals/crab.gif
diff --git a/sources/addons/smiley_pack/icons/animals/dog.gif b/sources/addon/smiley_pack/icons/animals/dog.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/dog.gif
rename to sources/addon/smiley_pack/icons/animals/dog.gif
diff --git a/sources/addons/smiley_pack/icons/animals/dolphin.gif b/sources/addon/smiley_pack/icons/animals/dolphin.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/dolphin.gif
rename to sources/addon/smiley_pack/icons/animals/dolphin.gif
diff --git a/sources/addons/smiley_pack/icons/animals/dragonfly.gif b/sources/addon/smiley_pack/icons/animals/dragonfly.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/dragonfly.gif
rename to sources/addon/smiley_pack/icons/animals/dragonfly.gif
diff --git a/sources/addons/smiley_pack/icons/animals/elephant.gif b/sources/addon/smiley_pack/icons/animals/elephant.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/elephant.gif
rename to sources/addon/smiley_pack/icons/animals/elephant.gif
diff --git a/sources/addons/smiley_pack/icons/animals/fish.gif b/sources/addon/smiley_pack/icons/animals/fish.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/fish.gif
rename to sources/addon/smiley_pack/icons/animals/fish.gif
diff --git a/sources/addons/smiley_pack/icons/animals/frog.gif b/sources/addon/smiley_pack/icons/animals/frog.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/frog.gif
rename to sources/addon/smiley_pack/icons/animals/frog.gif
diff --git a/sources/addons/smiley_pack/icons/animals/giraffe.gif b/sources/addon/smiley_pack/icons/animals/giraffe.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/giraffe.gif
rename to sources/addon/smiley_pack/icons/animals/giraffe.gif
diff --git a/sources/addons/smiley_pack/icons/animals/hamster.gif b/sources/addon/smiley_pack/icons/animals/hamster.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/hamster.gif
rename to sources/addon/smiley_pack/icons/animals/hamster.gif
diff --git a/sources/addons/smiley_pack/icons/animals/horse.gif b/sources/addon/smiley_pack/icons/animals/horse.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/horse.gif
rename to sources/addon/smiley_pack/icons/animals/horse.gif
diff --git a/sources/addons/smiley_pack/icons/animals/ladybird.gif b/sources/addon/smiley_pack/icons/animals/ladybird.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/ladybird.gif
rename to sources/addon/smiley_pack/icons/animals/ladybird.gif
diff --git a/sources/addons/smiley_pack/icons/animals/monkey.gif b/sources/addon/smiley_pack/icons/animals/monkey.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/monkey.gif
rename to sources/addon/smiley_pack/icons/animals/monkey.gif
diff --git a/sources/addons/smiley_pack/icons/animals/parrot.gif b/sources/addon/smiley_pack/icons/animals/parrot.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/parrot.gif
rename to sources/addon/smiley_pack/icons/animals/parrot.gif
diff --git a/sources/addons/smiley_pack/icons/animals/pig.gif b/sources/addon/smiley_pack/icons/animals/pig.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/pig.gif
rename to sources/addon/smiley_pack/icons/animals/pig.gif
diff --git a/sources/addons/smiley_pack/icons/animals/sheep.gif b/sources/addon/smiley_pack/icons/animals/sheep.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/sheep.gif
rename to sources/addon/smiley_pack/icons/animals/sheep.gif
diff --git a/sources/addons/smiley_pack/icons/animals/snail.gif b/sources/addon/smiley_pack/icons/animals/snail.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/snail.gif
rename to sources/addon/smiley_pack/icons/animals/snail.gif
diff --git a/sources/addons/smiley_pack/icons/animals/tux.gif b/sources/addon/smiley_pack/icons/animals/tux.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/animals/tux.gif
rename to sources/addon/smiley_pack/icons/animals/tux.gif
diff --git a/sources/addons/smiley_pack/icons/babies/baby.gif b/sources/addon/smiley_pack/icons/babies/baby.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/babies/baby.gif
rename to sources/addon/smiley_pack/icons/babies/baby.gif
diff --git a/sources/addons/smiley_pack/icons/babies/babycot.gif b/sources/addon/smiley_pack/icons/babies/babycot.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/babies/babycot.gif
rename to sources/addon/smiley_pack/icons/babies/babycot.gif
diff --git a/sources/addons/smiley_pack/icons/babies/pregnant.gif b/sources/addon/smiley_pack/icons/babies/pregnant.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/babies/pregnant.gif
rename to sources/addon/smiley_pack/icons/babies/pregnant.gif
diff --git a/sources/addons/smiley_pack/icons/babies/stork.gif b/sources/addon/smiley_pack/icons/babies/stork.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/babies/stork.gif
rename to sources/addon/smiley_pack/icons/babies/stork.gif
diff --git a/sources/addons/smiley_pack/icons/confused/confused.gif b/sources/addon/smiley_pack/icons/confused/confused.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/confused/confused.gif
rename to sources/addon/smiley_pack/icons/confused/confused.gif
diff --git a/sources/addons/smiley_pack/icons/confused/dazed.gif b/sources/addon/smiley_pack/icons/confused/dazed.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/confused/dazed.gif
rename to sources/addon/smiley_pack/icons/confused/dazed.gif
diff --git a/sources/addons/smiley_pack/icons/confused/shrug.gif b/sources/addon/smiley_pack/icons/confused/shrug.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/confused/shrug.gif
rename to sources/addon/smiley_pack/icons/confused/shrug.gif
diff --git a/sources/addons/smiley_pack/icons/confused/stupid.gif b/sources/addon/smiley_pack/icons/confused/stupid.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/confused/stupid.gif
rename to sources/addon/smiley_pack/icons/confused/stupid.gif
diff --git a/sources/addons/smiley_pack/icons/cool/affro.gif b/sources/addon/smiley_pack/icons/cool/affro.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/cool/affro.gif
rename to sources/addon/smiley_pack/icons/cool/affro.gif
diff --git a/sources/addons/smiley_pack/icons/cool/cool.gif b/sources/addon/smiley_pack/icons/cool/cool.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/cool/cool.gif
rename to sources/addon/smiley_pack/icons/cool/cool.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/angel.gif b/sources/addon/smiley_pack/icons/devilangel/angel.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/angel.gif
rename to sources/addon/smiley_pack/icons/devilangel/angel.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/blondedevil.gif b/sources/addon/smiley_pack/icons/devilangel/blondedevil.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/blondedevil.gif
rename to sources/addon/smiley_pack/icons/devilangel/blondedevil.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/catdevil.gif b/sources/addon/smiley_pack/icons/devilangel/catdevil.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/catdevil.gif
rename to sources/addon/smiley_pack/icons/devilangel/catdevil.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/cherub.gif b/sources/addon/smiley_pack/icons/devilangel/cherub.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/cherub.gif
rename to sources/addon/smiley_pack/icons/devilangel/cherub.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/daseesaw.gif b/sources/addon/smiley_pack/icons/devilangel/daseesaw.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/daseesaw.gif
rename to sources/addon/smiley_pack/icons/devilangel/daseesaw.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/devil.gif b/sources/addon/smiley_pack/icons/devilangel/devil.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/devil.gif
rename to sources/addon/smiley_pack/icons/devilangel/devil.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/graveside.gif b/sources/addon/smiley_pack/icons/devilangel/graveside.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/graveside.gif
rename to sources/addon/smiley_pack/icons/devilangel/graveside.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/saint.gif b/sources/addon/smiley_pack/icons/devilangel/saint.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/saint.gif
rename to sources/addon/smiley_pack/icons/devilangel/saint.gif
diff --git a/sources/addons/smiley_pack/icons/devilangel/turnevil.gif b/sources/addon/smiley_pack/icons/devilangel/turnevil.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/devilangel/turnevil.gif
rename to sources/addon/smiley_pack/icons/devilangel/turnevil.gif
diff --git a/sources/addons/smiley_pack/icons/disgust/fartblush.gif b/sources/addon/smiley_pack/icons/disgust/fartblush.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/disgust/fartblush.gif
rename to sources/addon/smiley_pack/icons/disgust/fartblush.gif
diff --git a/sources/addons/smiley_pack/icons/disgust/fartinbed.gif b/sources/addon/smiley_pack/icons/disgust/fartinbed.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/disgust/fartinbed.gif
rename to sources/addon/smiley_pack/icons/disgust/fartinbed.gif
diff --git a/sources/addons/smiley_pack/icons/disgust/toilet.gif b/sources/addon/smiley_pack/icons/disgust/toilet.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/disgust/toilet.gif
rename to sources/addon/smiley_pack/icons/disgust/toilet.gif
diff --git a/sources/addons/smiley_pack/icons/disgust/vomit.gif b/sources/addon/smiley_pack/icons/disgust/vomit.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/disgust/vomit.gif
rename to sources/addon/smiley_pack/icons/disgust/vomit.gif
diff --git a/sources/addons/smiley_pack/icons/drink/tea.gif b/sources/addon/smiley_pack/icons/drink/tea.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/drink/tea.gif
rename to sources/addon/smiley_pack/icons/drink/tea.gif
diff --git a/sources/addons/smiley_pack/icons/drool/drool.gif b/sources/addon/smiley_pack/icons/drool/drool.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/drool/drool.gif
rename to sources/addon/smiley_pack/icons/drool/drool.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/alienmonster.gif b/sources/addon/smiley_pack/icons/fantasy/alienmonster.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/alienmonster.gif
rename to sources/addon/smiley_pack/icons/fantasy/alienmonster.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/barbarian.gif b/sources/addon/smiley_pack/icons/fantasy/barbarian.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/barbarian.gif
rename to sources/addon/smiley_pack/icons/fantasy/barbarian.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/dinosaur.gif b/sources/addon/smiley_pack/icons/fantasy/dinosaur.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/dinosaur.gif
rename to sources/addon/smiley_pack/icons/fantasy/dinosaur.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/doctor.gif b/sources/addon/smiley_pack/icons/fantasy/doctor.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/doctor.gif
rename to sources/addon/smiley_pack/icons/fantasy/doctor.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/dragon.gif b/sources/addon/smiley_pack/icons/fantasy/dragon.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/dragon.gif
rename to sources/addon/smiley_pack/icons/fantasy/dragon.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/dragonwhelp.gif b/sources/addon/smiley_pack/icons/fantasy/dragonwhelp.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/dragonwhelp.gif
rename to sources/addon/smiley_pack/icons/fantasy/dragonwhelp.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/ghost.gif b/sources/addon/smiley_pack/icons/fantasy/ghost.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/ghost.gif
rename to sources/addon/smiley_pack/icons/fantasy/ghost.gif
diff --git a/sources/addons/smiley_pack/icons/fantasy/mummy.gif b/sources/addon/smiley_pack/icons/fantasy/mummy.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fantasy/mummy.gif
rename to sources/addon/smiley_pack/icons/fantasy/mummy.gif
diff --git a/sources/addons/smiley_pack/icons/fight/2guns.gif b/sources/addon/smiley_pack/icons/fight/2guns.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/2guns.gif
rename to sources/addon/smiley_pack/icons/fight/2guns.gif
diff --git a/sources/addons/smiley_pack/icons/fight/acid.gif b/sources/addon/smiley_pack/icons/fight/acid.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/acid.gif
rename to sources/addon/smiley_pack/icons/fight/acid.gif
diff --git a/sources/addons/smiley_pack/icons/fight/alienfight.gif b/sources/addon/smiley_pack/icons/fight/alienfight.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/alienfight.gif
rename to sources/addon/smiley_pack/icons/fight/alienfight.gif
diff --git a/sources/addons/smiley_pack/icons/fight/alpha.png b/sources/addon/smiley_pack/icons/fight/alpha.png
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/alpha.png
rename to sources/addon/smiley_pack/icons/fight/alpha.png
diff --git a/sources/addons/smiley_pack/icons/fight/army.gif b/sources/addon/smiley_pack/icons/fight/army.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/army.gif
rename to sources/addon/smiley_pack/icons/fight/army.gif
diff --git a/sources/addons/smiley_pack/icons/fight/arrowhead.gif b/sources/addon/smiley_pack/icons/fight/arrowhead.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/arrowhead.gif
rename to sources/addon/smiley_pack/icons/fight/arrowhead.gif
diff --git a/sources/addons/smiley_pack/icons/fight/bfg.gif b/sources/addon/smiley_pack/icons/fight/bfg.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/bfg.gif
rename to sources/addon/smiley_pack/icons/fight/bfg.gif
diff --git a/sources/addons/smiley_pack/icons/fight/bowman.gif b/sources/addon/smiley_pack/icons/fight/bowman.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/bowman.gif
rename to sources/addon/smiley_pack/icons/fight/bowman.gif
diff --git a/sources/addons/smiley_pack/icons/fight/chainsaw.gif b/sources/addon/smiley_pack/icons/fight/chainsaw.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/chainsaw.gif
rename to sources/addon/smiley_pack/icons/fight/chainsaw.gif
diff --git a/sources/addons/smiley_pack/icons/fight/crossbow.gif b/sources/addon/smiley_pack/icons/fight/crossbow.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/crossbow.gif
rename to sources/addon/smiley_pack/icons/fight/crossbow.gif
diff --git a/sources/addons/smiley_pack/icons/fight/crusader.gif b/sources/addon/smiley_pack/icons/fight/crusader.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/crusader.gif
rename to sources/addon/smiley_pack/icons/fight/crusader.gif
diff --git a/sources/addons/smiley_pack/icons/fight/dead.gif b/sources/addon/smiley_pack/icons/fight/dead.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/dead.gif
rename to sources/addon/smiley_pack/icons/fight/dead.gif
diff --git a/sources/addons/smiley_pack/icons/fight/gangs.gif b/sources/addon/smiley_pack/icons/fight/gangs.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/gangs.gif
rename to sources/addon/smiley_pack/icons/fight/gangs.gif
diff --git a/sources/addons/smiley_pack/icons/fight/hammersplat.gif b/sources/addon/smiley_pack/icons/fight/hammersplat.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/hammersplat.gif
rename to sources/addon/smiley_pack/icons/fight/hammersplat.gif
diff --git a/sources/addons/smiley_pack/icons/fight/lasergun.gif b/sources/addon/smiley_pack/icons/fight/lasergun.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/lasergun.gif
rename to sources/addon/smiley_pack/icons/fight/lasergun.gif
diff --git a/sources/addons/smiley_pack/icons/fight/machinegun.gif b/sources/addon/smiley_pack/icons/fight/machinegun.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/machinegun.gif
rename to sources/addon/smiley_pack/icons/fight/machinegun.gif
diff --git a/sources/addons/smiley_pack/icons/fight/marine.gif b/sources/addon/smiley_pack/icons/fight/marine.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/marine.gif
rename to sources/addon/smiley_pack/icons/fight/marine.gif
diff --git a/sources/addons/smiley_pack/icons/fight/sabre.gif b/sources/addon/smiley_pack/icons/fight/sabre.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/sabre.gif
rename to sources/addon/smiley_pack/icons/fight/sabre.gif
diff --git a/sources/addons/smiley_pack/icons/fight/samurai.gif b/sources/addon/smiley_pack/icons/fight/samurai.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/samurai.gif
rename to sources/addon/smiley_pack/icons/fight/samurai.gif
diff --git a/sources/addons/smiley_pack/icons/fight/tank.gif b/sources/addon/smiley_pack/icons/fight/tank.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/tank.gif
rename to sources/addon/smiley_pack/icons/fight/tank.gif
diff --git a/sources/addons/smiley_pack/icons/fight/throw-rocks.gif b/sources/addon/smiley_pack/icons/fight/throw-rocks.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/throw-rocks.gif
rename to sources/addon/smiley_pack/icons/fight/throw-rocks.gif
diff --git a/sources/addons/smiley_pack/icons/fight/viking.gif b/sources/addon/smiley_pack/icons/fight/viking.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/fight/viking.gif
rename to sources/addon/smiley_pack/icons/fight/viking.gif
diff --git a/sources/addons/smiley_pack/icons/food/apple.gif b/sources/addon/smiley_pack/icons/food/apple.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/apple.gif
rename to sources/addon/smiley_pack/icons/food/apple.gif
diff --git a/sources/addons/smiley_pack/icons/food/banana.gif b/sources/addon/smiley_pack/icons/food/banana.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/banana.gif
rename to sources/addon/smiley_pack/icons/food/banana.gif
diff --git a/sources/addons/smiley_pack/icons/food/birthdaycake.gif b/sources/addon/smiley_pack/icons/food/birthdaycake.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/birthdaycake.gif
rename to sources/addon/smiley_pack/icons/food/birthdaycake.gif
diff --git a/sources/addons/smiley_pack/icons/food/broccoli.gif b/sources/addon/smiley_pack/icons/food/broccoli.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/broccoli.gif
rename to sources/addon/smiley_pack/icons/food/broccoli.gif
diff --git a/sources/addons/smiley_pack/icons/food/cake.gif b/sources/addon/smiley_pack/icons/food/cake.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/cake.gif
rename to sources/addon/smiley_pack/icons/food/cake.gif
diff --git a/sources/addons/smiley_pack/icons/food/carrot.gif b/sources/addon/smiley_pack/icons/food/carrot.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/carrot.gif
rename to sources/addon/smiley_pack/icons/food/carrot.gif
diff --git a/sources/addons/smiley_pack/icons/food/cooking.gif b/sources/addon/smiley_pack/icons/food/cooking.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/cooking.gif
rename to sources/addon/smiley_pack/icons/food/cooking.gif
diff --git a/sources/addons/smiley_pack/icons/food/fryegg.gif b/sources/addon/smiley_pack/icons/food/fryegg.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/fryegg.gif
rename to sources/addon/smiley_pack/icons/food/fryegg.gif
diff --git a/sources/addons/smiley_pack/icons/food/popcorn.gif b/sources/addon/smiley_pack/icons/food/popcorn.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/popcorn.gif
rename to sources/addon/smiley_pack/icons/food/popcorn.gif
diff --git a/sources/addons/smiley_pack/icons/food/tomato.gif b/sources/addon/smiley_pack/icons/food/tomato.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/food/tomato.gif
rename to sources/addon/smiley_pack/icons/food/tomato.gif
diff --git a/sources/addons/smiley_pack/icons/happy/cloud9.gif b/sources/addon/smiley_pack/icons/happy/cloud9.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/happy/cloud9.gif
rename to sources/addon/smiley_pack/icons/happy/cloud9.gif
diff --git a/sources/addons/smiley_pack/icons/happy/tearsofjoy.gif b/sources/addon/smiley_pack/icons/happy/tearsofjoy.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/happy/tearsofjoy.gif
rename to sources/addon/smiley_pack/icons/happy/tearsofjoy.gif
diff --git a/sources/addons/smiley_pack/icons/laugh/hahaha.gif b/sources/addon/smiley_pack/icons/laugh/hahaha.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/laugh/hahaha.gif
rename to sources/addon/smiley_pack/icons/laugh/hahaha.gif
diff --git a/sources/addons/smiley_pack/icons/laugh/loltv.gif b/sources/addon/smiley_pack/icons/laugh/loltv.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/laugh/loltv.gif
rename to sources/addon/smiley_pack/icons/laugh/loltv.gif
diff --git a/sources/addons/smiley_pack/icons/laugh/rofl.gif b/sources/addon/smiley_pack/icons/laugh/rofl.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/laugh/rofl.gif
rename to sources/addon/smiley_pack/icons/laugh/rofl.gif
diff --git a/sources/addons/smiley_pack/icons/laugh/snicker.jpeg b/sources/addon/smiley_pack/icons/laugh/snicker.jpeg
similarity index 100%
rename from sources/addons/smiley_pack/icons/laugh/snicker.jpeg
rename to sources/addon/smiley_pack/icons/laugh/snicker.jpeg
diff --git a/sources/addons/smiley_pack/icons/love/iloveyou.gif b/sources/addon/smiley_pack/icons/love/iloveyou.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/love/iloveyou.gif
rename to sources/addon/smiley_pack/icons/love/iloveyou.gif
diff --git a/sources/addons/smiley_pack/icons/love/inlove.gif b/sources/addon/smiley_pack/icons/love/inlove.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/love/inlove.gif
rename to sources/addon/smiley_pack/icons/love/inlove.gif
diff --git a/sources/addons/smiley_pack/icons/love/love.gif b/sources/addon/smiley_pack/icons/love/love.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/love/love.gif
rename to sources/addon/smiley_pack/icons/love/love.gif
diff --git a/sources/addons/smiley_pack/icons/love/lovebear.gif b/sources/addon/smiley_pack/icons/love/lovebear.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/love/lovebear.gif
rename to sources/addon/smiley_pack/icons/love/lovebear.gif
diff --git a/sources/addons/smiley_pack/icons/love/lovebed.gif b/sources/addon/smiley_pack/icons/love/lovebed.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/love/lovebed.gif
rename to sources/addon/smiley_pack/icons/love/lovebed.gif
diff --git a/sources/addons/smiley_pack/icons/love/loveheart.gif b/sources/addon/smiley_pack/icons/love/loveheart.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/love/loveheart.gif
rename to sources/addon/smiley_pack/icons/love/loveheart.gif
diff --git a/sources/addons/smiley_pack/icons/music/dj.gif b/sources/addon/smiley_pack/icons/music/dj.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/music/dj.gif
rename to sources/addon/smiley_pack/icons/music/dj.gif
diff --git a/sources/addons/smiley_pack/icons/music/drums.gif b/sources/addon/smiley_pack/icons/music/drums.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/music/drums.gif
rename to sources/addon/smiley_pack/icons/music/drums.gif
diff --git a/sources/addons/smiley_pack/icons/music/elvis.gif b/sources/addon/smiley_pack/icons/music/elvis.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/music/elvis.gif
rename to sources/addon/smiley_pack/icons/music/elvis.gif
diff --git a/sources/addons/smiley_pack/icons/music/guitar.gif b/sources/addon/smiley_pack/icons/music/guitar.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/music/guitar.gif
rename to sources/addon/smiley_pack/icons/music/guitar.gif
diff --git a/sources/addons/smiley_pack/icons/music/trumpet.gif b/sources/addon/smiley_pack/icons/music/trumpet.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/music/trumpet.gif
rename to sources/addon/smiley_pack/icons/music/trumpet.gif
diff --git a/sources/addons/smiley_pack/icons/music/violin.gif b/sources/addon/smiley_pack/icons/music/violin.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/music/violin.gif
rename to sources/addon/smiley_pack/icons/music/violin.gif
diff --git a/sources/addons/smiley_pack/icons/oldcore/beard.png b/sources/addon/smiley_pack/icons/oldcore/beard.png
similarity index 100%
rename from sources/addons/smiley_pack/icons/oldcore/beard.png
rename to sources/addon/smiley_pack/icons/oldcore/beard.png
diff --git a/sources/addons/smiley_pack/icons/oldcore/headbang.gif b/sources/addon/smiley_pack/icons/oldcore/headbang.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/oldcore/headbang.gif
rename to sources/addon/smiley_pack/icons/oldcore/headbang.gif
diff --git a/sources/addons/smiley_pack/icons/oldcore/laughing.gif b/sources/addon/smiley_pack/icons/oldcore/laughing.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/oldcore/laughing.gif
rename to sources/addon/smiley_pack/icons/oldcore/laughing.gif
diff --git a/sources/addons/smiley_pack/icons/oldcore/shaka.gif b/sources/addon/smiley_pack/icons/oldcore/shaka.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/oldcore/shaka.gif
rename to sources/addon/smiley_pack/icons/oldcore/shaka.gif
diff --git a/sources/addons/smiley_pack/icons/oldcore/surprised.gif b/sources/addon/smiley_pack/icons/oldcore/surprised.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/oldcore/surprised.gif
rename to sources/addon/smiley_pack/icons/oldcore/surprised.gif
diff --git a/sources/addons/smiley_pack/icons/oldcore/whitebeard.png b/sources/addon/smiley_pack/icons/oldcore/whitebeard.png
similarity index 100%
rename from sources/addons/smiley_pack/icons/oldcore/whitebeard.png
rename to sources/addon/smiley_pack/icons/oldcore/whitebeard.png
diff --git a/sources/addons/smiley_pack/icons/respect/bow.gif b/sources/addon/smiley_pack/icons/respect/bow.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/respect/bow.gif
rename to sources/addon/smiley_pack/icons/respect/bow.gif
diff --git a/sources/addons/smiley_pack/icons/respect/bravo.gif b/sources/addon/smiley_pack/icons/respect/bravo.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/respect/bravo.gif
rename to sources/addon/smiley_pack/icons/respect/bravo.gif
diff --git a/sources/addons/smiley_pack/icons/respect/hailking.gif b/sources/addon/smiley_pack/icons/respect/hailking.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/respect/hailking.gif
rename to sources/addon/smiley_pack/icons/respect/hailking.gif
diff --git a/sources/addons/smiley_pack/icons/respect/number1.gif b/sources/addon/smiley_pack/icons/respect/number1.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/respect/number1.gif
rename to sources/addon/smiley_pack/icons/respect/number1.gif
diff --git a/sources/addons/smiley_pack/icons/respect/towel.gif b/sources/addon/smiley_pack/icons/respect/towel.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/respect/towel.gif
rename to sources/addon/smiley_pack/icons/respect/towel.gif
diff --git a/sources/addons/smiley_pack/icons/sad/crying.png b/sources/addon/smiley_pack/icons/sad/crying.png
similarity index 100%
rename from sources/addons/smiley_pack/icons/sad/crying.png
rename to sources/addon/smiley_pack/icons/sad/crying.png
diff --git a/sources/addons/smiley_pack/icons/sad/prisoner.gif b/sources/addon/smiley_pack/icons/sad/prisoner.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sad/prisoner.gif
rename to sources/addon/smiley_pack/icons/sad/prisoner.gif
diff --git a/sources/addons/smiley_pack/icons/sad/sigh.gif b/sources/addon/smiley_pack/icons/sad/sigh.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sad/sigh.gif
rename to sources/addon/smiley_pack/icons/sad/sigh.gif
diff --git a/sources/addons/smiley_pack/icons/smoking/smoking.gif b/sources/addon/smiley_pack/icons/smoking/smoking.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/smoking/smoking.gif
rename to sources/addon/smiley_pack/icons/smoking/smoking.gif
diff --git a/sources/addons/smiley_pack/icons/sport/archery.gif b/sources/addon/smiley_pack/icons/sport/archery.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/archery.gif
rename to sources/addon/smiley_pack/icons/sport/archery.gif
diff --git a/sources/addons/smiley_pack/icons/sport/basketball.gif b/sources/addon/smiley_pack/icons/sport/basketball.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/basketball.gif
rename to sources/addon/smiley_pack/icons/sport/basketball.gif
diff --git a/sources/addons/smiley_pack/icons/sport/bowling.gif b/sources/addon/smiley_pack/icons/sport/bowling.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/bowling.gif
rename to sources/addon/smiley_pack/icons/sport/bowling.gif
diff --git a/sources/addons/smiley_pack/icons/sport/cycling.gif b/sources/addon/smiley_pack/icons/sport/cycling.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/cycling.gif
rename to sources/addon/smiley_pack/icons/sport/cycling.gif
diff --git a/sources/addons/smiley_pack/icons/sport/darts.gif b/sources/addon/smiley_pack/icons/sport/darts.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/darts.gif
rename to sources/addon/smiley_pack/icons/sport/darts.gif
diff --git a/sources/addons/smiley_pack/icons/sport/fencing.gif b/sources/addon/smiley_pack/icons/sport/fencing.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/fencing.gif
rename to sources/addon/smiley_pack/icons/sport/fencing.gif
diff --git a/sources/addons/smiley_pack/icons/sport/football.gif b/sources/addon/smiley_pack/icons/sport/football.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/football.gif
rename to sources/addon/smiley_pack/icons/sport/football.gif
diff --git a/sources/addons/smiley_pack/icons/sport/golf.gif b/sources/addon/smiley_pack/icons/sport/golf.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/golf.gif
rename to sources/addon/smiley_pack/icons/sport/golf.gif
diff --git a/sources/addons/smiley_pack/icons/sport/horseriding.gif b/sources/addon/smiley_pack/icons/sport/horseriding.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/horseriding.gif
rename to sources/addon/smiley_pack/icons/sport/horseriding.gif
diff --git a/sources/addons/smiley_pack/icons/sport/juggling.gif b/sources/addon/smiley_pack/icons/sport/juggling.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/juggling.gif
rename to sources/addon/smiley_pack/icons/sport/juggling.gif
diff --git a/sources/addons/smiley_pack/icons/sport/skipping.gif b/sources/addon/smiley_pack/icons/sport/skipping.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/skipping.gif
rename to sources/addon/smiley_pack/icons/sport/skipping.gif
diff --git a/sources/addons/smiley_pack/icons/sport/snooker.gif b/sources/addon/smiley_pack/icons/sport/snooker.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/snooker.gif
rename to sources/addon/smiley_pack/icons/sport/snooker.gif
diff --git a/sources/addons/smiley_pack/icons/sport/surfing.gif b/sources/addon/smiley_pack/icons/sport/surfing.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/surfing.gif
rename to sources/addon/smiley_pack/icons/sport/surfing.gif
diff --git a/sources/addons/smiley_pack/icons/sport/tennis.gif b/sources/addon/smiley_pack/icons/sport/tennis.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/sport/tennis.gif
rename to sources/addon/smiley_pack/icons/sport/tennis.gif
diff --git a/sources/addons/smiley_pack/icons/things/cloud9.gif b/sources/addon/smiley_pack/icons/things/cloud9.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/things/cloud9.gif
rename to sources/addon/smiley_pack/icons/things/cloud9.gif
diff --git a/sources/addons/smiley_pack/icons/tired/countsheep.gif b/sources/addon/smiley_pack/icons/tired/countsheep.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/tired/countsheep.gif
rename to sources/addon/smiley_pack/icons/tired/countsheep.gif
diff --git a/sources/addons/smiley_pack/icons/tired/hammock.gif b/sources/addon/smiley_pack/icons/tired/hammock.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/tired/hammock.gif
rename to sources/addon/smiley_pack/icons/tired/hammock.gif
diff --git a/sources/addons/smiley_pack/icons/tired/pillow.gif b/sources/addon/smiley_pack/icons/tired/pillow.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/tired/pillow.gif
rename to sources/addon/smiley_pack/icons/tired/pillow.gif
diff --git a/sources/addons/smiley_pack/icons/tired/yawn.gif b/sources/addon/smiley_pack/icons/tired/yawn.gif
similarity index 100%
rename from sources/addons/smiley_pack/icons/tired/yawn.gif
rename to sources/addon/smiley_pack/icons/tired/yawn.gif
diff --git a/sources/addons/smiley_pack/smiley_pack.php b/sources/addon/smiley_pack/smiley_pack.php
similarity index 100%
rename from sources/addons/smiley_pack/smiley_pack.php
rename to sources/addon/smiley_pack/smiley_pack.php
diff --git a/sources/addons/smileybutton/icon.gif b/sources/addon/smileybutton/icon.gif
similarity index 100%
rename from sources/addons/smileybutton/icon.gif
rename to sources/addon/smileybutton/icon.gif
diff --git a/sources/addons/smileybutton/smileybutton.css b/sources/addon/smileybutton/smileybutton.css
similarity index 100%
rename from sources/addons/smileybutton/smileybutton.css
rename to sources/addon/smileybutton/smileybutton.css
diff --git a/sources/addons/smileybutton/smileybutton.php b/sources/addon/smileybutton/smileybutton.php
similarity index 100%
rename from sources/addons/smileybutton/smileybutton.php
rename to sources/addon/smileybutton/smileybutton.php
diff --git a/sources/addons/startpage/lang/C/messages.po b/sources/addon/startpage/lang/C/messages.po
similarity index 100%
rename from sources/addons/startpage/lang/C/messages.po
rename to sources/addon/startpage/lang/C/messages.po
diff --git a/sources/addons/startpage/lang/ca/strings.php b/sources/addon/startpage/lang/ca/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/ca/strings.php
rename to sources/addon/startpage/lang/ca/strings.php
diff --git a/sources/addons/startpage/lang/cs/strings.php b/sources/addon/startpage/lang/cs/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/cs/strings.php
rename to sources/addon/startpage/lang/cs/strings.php
diff --git a/sources/addons/startpage/lang/de/strings.php b/sources/addon/startpage/lang/de/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/de/strings.php
rename to sources/addon/startpage/lang/de/strings.php
diff --git a/sources/addons/startpage/lang/eo/strings.php b/sources/addon/startpage/lang/eo/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/eo/strings.php
rename to sources/addon/startpage/lang/eo/strings.php
diff --git a/sources/addons/startpage/lang/es/strings.php b/sources/addon/startpage/lang/es/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/es/strings.php
rename to sources/addon/startpage/lang/es/strings.php
diff --git a/sources/addons/startpage/lang/fr/strings.php b/sources/addon/startpage/lang/fr/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/fr/strings.php
rename to sources/addon/startpage/lang/fr/strings.php
diff --git a/sources/addons/startpage/lang/is/strings.php b/sources/addon/startpage/lang/is/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/is/strings.php
rename to sources/addon/startpage/lang/is/strings.php
diff --git a/sources/addons/startpage/lang/it/strings.php b/sources/addon/startpage/lang/it/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/it/strings.php
rename to sources/addon/startpage/lang/it/strings.php
diff --git a/sources/addons/startpage/lang/nb-no/strings.php b/sources/addon/startpage/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/nb-no/strings.php
rename to sources/addon/startpage/lang/nb-no/strings.php
diff --git a/sources/addons/startpage/lang/pl/strings.php b/sources/addon/startpage/lang/pl/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/pl/strings.php
rename to sources/addon/startpage/lang/pl/strings.php
diff --git a/sources/addons/startpage/lang/pt-br/strings.php b/sources/addon/startpage/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/pt-br/strings.php
rename to sources/addon/startpage/lang/pt-br/strings.php
diff --git a/sources/addons/startpage/lang/ru/strings.php b/sources/addon/startpage/lang/ru/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/ru/strings.php
rename to sources/addon/startpage/lang/ru/strings.php
diff --git a/sources/addons/startpage/lang/sv/strings.php b/sources/addon/startpage/lang/sv/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/sv/strings.php
rename to sources/addon/startpage/lang/sv/strings.php
diff --git a/sources/addons/startpage/lang/zh-cn/strings.php b/sources/addon/startpage/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/startpage/lang/zh-cn/strings.php
rename to sources/addon/startpage/lang/zh-cn/strings.php
diff --git a/sources/addons/startpage/startpage.css b/sources/addon/startpage/startpage.css
similarity index 100%
rename from sources/addons/startpage/startpage.css
rename to sources/addon/startpage/startpage.css
diff --git a/sources/addons/startpage/startpage.php b/sources/addon/startpage/startpage.php
similarity index 100%
rename from sources/addons/startpage/startpage.php
rename to sources/addon/startpage/startpage.php
diff --git a/sources/addons/statistics_json/statistics_json.php b/sources/addon/statistics_json/statistics_json.php
similarity index 100%
rename from sources/addons/statistics_json/statistics_json.php
rename to sources/addon/statistics_json/statistics_json.php
diff --git a/sources/addons/statusnet/README b/sources/addon/statusnet/README
similarity index 100%
rename from sources/addons/statusnet/README
rename to sources/addon/statusnet/README
diff --git a/sources/addons/statusnet/gnusocial.png b/sources/addon/statusnet/gnusocial.png
similarity index 100%
rename from sources/addons/statusnet/gnusocial.png
rename to sources/addon/statusnet/gnusocial.png
diff --git a/sources/addons/statusnet/lang/C/messages.po b/sources/addon/statusnet/lang/C/messages.po
similarity index 100%
rename from sources/addons/statusnet/lang/C/messages.po
rename to sources/addon/statusnet/lang/C/messages.po
diff --git a/sources/addons/statusnet/lang/ca/strings.php b/sources/addon/statusnet/lang/ca/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/ca/strings.php
rename to sources/addon/statusnet/lang/ca/strings.php
diff --git a/sources/addons/statusnet/lang/cs/strings.php b/sources/addon/statusnet/lang/cs/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/cs/strings.php
rename to sources/addon/statusnet/lang/cs/strings.php
diff --git a/sources/addons/statusnet/lang/de/strings.php b/sources/addon/statusnet/lang/de/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/de/strings.php
rename to sources/addon/statusnet/lang/de/strings.php
diff --git a/sources/addons/statusnet/lang/eo/strings.php b/sources/addon/statusnet/lang/eo/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/eo/strings.php
rename to sources/addon/statusnet/lang/eo/strings.php
diff --git a/sources/addons/statusnet/lang/es/strings.php b/sources/addon/statusnet/lang/es/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/es/strings.php
rename to sources/addon/statusnet/lang/es/strings.php
diff --git a/sources/addons/statusnet/lang/fr/strings.php b/sources/addon/statusnet/lang/fr/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/fr/strings.php
rename to sources/addon/statusnet/lang/fr/strings.php
diff --git a/sources/addons/statusnet/lang/is/strings.php b/sources/addon/statusnet/lang/is/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/is/strings.php
rename to sources/addon/statusnet/lang/is/strings.php
diff --git a/sources/addons/statusnet/lang/it/strings.php b/sources/addon/statusnet/lang/it/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/it/strings.php
rename to sources/addon/statusnet/lang/it/strings.php
diff --git a/sources/addons/statusnet/lang/nb-no/strings.php b/sources/addon/statusnet/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/nb-no/strings.php
rename to sources/addon/statusnet/lang/nb-no/strings.php
diff --git a/sources/addons/statusnet/lang/nl/strings.php b/sources/addon/statusnet/lang/nl/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/nl/strings.php
rename to sources/addon/statusnet/lang/nl/strings.php
diff --git a/sources/addons/statusnet/lang/pl/strings.php b/sources/addon/statusnet/lang/pl/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/pl/strings.php
rename to sources/addon/statusnet/lang/pl/strings.php
diff --git a/sources/addons/statusnet/lang/pt-br/strings.php b/sources/addon/statusnet/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/pt-br/strings.php
rename to sources/addon/statusnet/lang/pt-br/strings.php
diff --git a/sources/addons/statusnet/lang/ru/strings.php b/sources/addon/statusnet/lang/ru/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/ru/strings.php
rename to sources/addon/statusnet/lang/ru/strings.php
diff --git a/sources/addons/statusnet/lang/sv/strings.php b/sources/addon/statusnet/lang/sv/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/sv/strings.php
rename to sources/addon/statusnet/lang/sv/strings.php
diff --git a/sources/addons/statusnet/lang/zh-cn/strings.php b/sources/addon/statusnet/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/statusnet/lang/zh-cn/strings.php
rename to sources/addon/statusnet/lang/zh-cn/strings.php
diff --git a/sources/addons/statusnet/signinwithgnusocial.png b/sources/addon/statusnet/signinwithgnusocial.png
similarity index 100%
rename from sources/addons/statusnet/signinwithgnusocial.png
rename to sources/addon/statusnet/signinwithgnusocial.png
diff --git a/sources/addons/statusnet/statusnet.css b/sources/addon/statusnet/statusnet.css
similarity index 100%
rename from sources/addons/statusnet/statusnet.css
rename to sources/addon/statusnet/statusnet.css
diff --git a/sources/addons/statusnet/statusnet.php b/sources/addon/statusnet/statusnet.php
similarity index 100%
rename from sources/addons/statusnet/statusnet.php
rename to sources/addon/statusnet/statusnet.php
diff --git a/sources/addons/statusnet/view/tpl/admin.tpl b/sources/addon/statusnet/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/statusnet/view/tpl/admin.tpl
rename to sources/addon/statusnet/view/tpl/admin.tpl
diff --git a/sources/addons/superblock/lang/ca/strings.php b/sources/addon/superblock/lang/ca/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/ca/strings.php
rename to sources/addon/superblock/lang/ca/strings.php
diff --git a/sources/addons/superblock/lang/de/strings.php b/sources/addon/superblock/lang/de/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/de/strings.php
rename to sources/addon/superblock/lang/de/strings.php
diff --git a/sources/addons/superblock/lang/es/strings.php b/sources/addon/superblock/lang/es/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/es/strings.php
rename to sources/addon/superblock/lang/es/strings.php
diff --git a/sources/addons/superblock/lang/fr/strings.php b/sources/addon/superblock/lang/fr/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/fr/strings.php
rename to sources/addon/superblock/lang/fr/strings.php
diff --git a/sources/addons/superblock/lang/it/strings.php b/sources/addon/superblock/lang/it/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/it/strings.php
rename to sources/addon/superblock/lang/it/strings.php
diff --git a/sources/addons/superblock/lang/nl/strings.php b/sources/addon/superblock/lang/nl/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/nl/strings.php
rename to sources/addon/superblock/lang/nl/strings.php
diff --git a/sources/addons/superblock/lang/pt-br/strings.php b/sources/addon/superblock/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/pt-br/strings.php
rename to sources/addon/superblock/lang/pt-br/strings.php
diff --git a/sources/addons/superblock/lang/ru/strings.php b/sources/addon/superblock/lang/ru/strings.php
similarity index 100%
rename from sources/addons/superblock/lang/ru/strings.php
rename to sources/addon/superblock/lang/ru/strings.php
diff --git a/sources/addons/superblock/superblock.css b/sources/addon/superblock/superblock.css
similarity index 100%
rename from sources/addons/superblock/superblock.css
rename to sources/addon/superblock/superblock.css
diff --git a/sources/addons/superblock/superblock.php b/sources/addon/superblock/superblock.php
similarity index 100%
rename from sources/addons/superblock/superblock.php
rename to sources/addon/superblock/superblock.php
diff --git a/sources/addons/testdrive/README.md b/sources/addon/testdrive/README.md
similarity index 100%
rename from sources/addons/testdrive/README.md
rename to sources/addon/testdrive/README.md
diff --git a/sources/addons/testdrive/lang/C/messages.po b/sources/addon/testdrive/lang/C/messages.po
similarity index 100%
rename from sources/addons/testdrive/lang/C/messages.po
rename to sources/addon/testdrive/lang/C/messages.po
diff --git a/sources/addons/testdrive/lang/ca/strings.php b/sources/addon/testdrive/lang/ca/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/ca/strings.php
rename to sources/addon/testdrive/lang/ca/strings.php
diff --git a/sources/addons/testdrive/lang/cs/messages.po b/sources/addon/testdrive/lang/cs/messages.po
similarity index 100%
rename from sources/addons/testdrive/lang/cs/messages.po
rename to sources/addon/testdrive/lang/cs/messages.po
diff --git a/sources/addons/testdrive/lang/cs/strings.php b/sources/addon/testdrive/lang/cs/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/cs/strings.php
rename to sources/addon/testdrive/lang/cs/strings.php
diff --git a/sources/addons/testdrive/lang/de/messages.po b/sources/addon/testdrive/lang/de/messages.po
similarity index 100%
rename from sources/addons/testdrive/lang/de/messages.po
rename to sources/addon/testdrive/lang/de/messages.po
diff --git a/sources/addons/testdrive/lang/de/strings.php b/sources/addon/testdrive/lang/de/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/de/strings.php
rename to sources/addon/testdrive/lang/de/strings.php
diff --git a/sources/addons/testdrive/lang/eo/strings.php b/sources/addon/testdrive/lang/eo/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/eo/strings.php
rename to sources/addon/testdrive/lang/eo/strings.php
diff --git a/sources/addons/testdrive/lang/es/strings.php b/sources/addon/testdrive/lang/es/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/es/strings.php
rename to sources/addon/testdrive/lang/es/strings.php
diff --git a/sources/addons/testdrive/lang/fr/strings.php b/sources/addon/testdrive/lang/fr/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/fr/strings.php
rename to sources/addon/testdrive/lang/fr/strings.php
diff --git a/sources/addons/testdrive/lang/is/strings.php b/sources/addon/testdrive/lang/is/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/is/strings.php
rename to sources/addon/testdrive/lang/is/strings.php
diff --git a/sources/addons/testdrive/lang/it/messages.po b/sources/addon/testdrive/lang/it/messages.po
similarity index 100%
rename from sources/addons/testdrive/lang/it/messages.po
rename to sources/addon/testdrive/lang/it/messages.po
diff --git a/sources/addons/testdrive/lang/it/strings.php b/sources/addon/testdrive/lang/it/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/it/strings.php
rename to sources/addon/testdrive/lang/it/strings.php
diff --git a/sources/addons/testdrive/lang/nb-no/strings.php b/sources/addon/testdrive/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/nb-no/strings.php
rename to sources/addon/testdrive/lang/nb-no/strings.php
diff --git a/sources/addons/testdrive/lang/nl/strings.php b/sources/addon/testdrive/lang/nl/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/nl/strings.php
rename to sources/addon/testdrive/lang/nl/strings.php
diff --git a/sources/addons/testdrive/lang/pl/messages.po b/sources/addon/testdrive/lang/pl/messages.po
similarity index 100%
rename from sources/addons/testdrive/lang/pl/messages.po
rename to sources/addon/testdrive/lang/pl/messages.po
diff --git a/sources/addons/testdrive/lang/pl/strings.php b/sources/addon/testdrive/lang/pl/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/pl/strings.php
rename to sources/addon/testdrive/lang/pl/strings.php
diff --git a/sources/addons/testdrive/lang/pt-br/strings.php b/sources/addon/testdrive/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/pt-br/strings.php
rename to sources/addon/testdrive/lang/pt-br/strings.php
diff --git a/sources/addons/testdrive/lang/ro/messages.po b/sources/addon/testdrive/lang/ro/messages.po
similarity index 100%
rename from sources/addons/testdrive/lang/ro/messages.po
rename to sources/addon/testdrive/lang/ro/messages.po
diff --git a/sources/addons/testdrive/lang/ro/strings.php b/sources/addon/testdrive/lang/ro/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/ro/strings.php
rename to sources/addon/testdrive/lang/ro/strings.php
diff --git a/sources/addons/testdrive/lang/ru/strings.php b/sources/addon/testdrive/lang/ru/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/ru/strings.php
rename to sources/addon/testdrive/lang/ru/strings.php
diff --git a/sources/addons/testdrive/lang/sv/strings.php b/sources/addon/testdrive/lang/sv/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/sv/strings.php
rename to sources/addon/testdrive/lang/sv/strings.php
diff --git a/sources/addons/testdrive/lang/zh-cn/strings.php b/sources/addon/testdrive/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/testdrive/lang/zh-cn/strings.php
rename to sources/addon/testdrive/lang/zh-cn/strings.php
diff --git a/sources/addons/testdrive/testdrive.php b/sources/addon/testdrive/testdrive.php
similarity index 100%
rename from sources/addons/testdrive/testdrive.php
rename to sources/addon/testdrive/testdrive.php
diff --git a/sources/addons/tictac/lang/C/messages.po b/sources/addon/tictac/lang/C/messages.po
similarity index 100%
rename from sources/addons/tictac/lang/C/messages.po
rename to sources/addon/tictac/lang/C/messages.po
diff --git a/sources/addons/tictac/lang/ca/strings.php b/sources/addon/tictac/lang/ca/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/ca/strings.php
rename to sources/addon/tictac/lang/ca/strings.php
diff --git a/sources/addons/tictac/lang/cs/strings.php b/sources/addon/tictac/lang/cs/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/cs/strings.php
rename to sources/addon/tictac/lang/cs/strings.php
diff --git a/sources/addons/tictac/lang/de/strings.php b/sources/addon/tictac/lang/de/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/de/strings.php
rename to sources/addon/tictac/lang/de/strings.php
diff --git a/sources/addons/tictac/lang/eo/strings.php b/sources/addon/tictac/lang/eo/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/eo/strings.php
rename to sources/addon/tictac/lang/eo/strings.php
diff --git a/sources/addons/tictac/lang/es/strings.php b/sources/addon/tictac/lang/es/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/es/strings.php
rename to sources/addon/tictac/lang/es/strings.php
diff --git a/sources/addons/tictac/lang/fr/strings.php b/sources/addon/tictac/lang/fr/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/fr/strings.php
rename to sources/addon/tictac/lang/fr/strings.php
diff --git a/sources/addons/tictac/lang/is/strings.php b/sources/addon/tictac/lang/is/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/is/strings.php
rename to sources/addon/tictac/lang/is/strings.php
diff --git a/sources/addons/tictac/lang/it/strings.php b/sources/addon/tictac/lang/it/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/it/strings.php
rename to sources/addon/tictac/lang/it/strings.php
diff --git a/sources/addons/tictac/lang/nb-no/strings.php b/sources/addon/tictac/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/nb-no/strings.php
rename to sources/addon/tictac/lang/nb-no/strings.php
diff --git a/sources/addons/tictac/lang/pl/strings.php b/sources/addon/tictac/lang/pl/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/pl/strings.php
rename to sources/addon/tictac/lang/pl/strings.php
diff --git a/sources/addons/tictac/lang/pt-br/strings.php b/sources/addon/tictac/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/pt-br/strings.php
rename to sources/addon/tictac/lang/pt-br/strings.php
diff --git a/sources/addons/tictac/lang/ru/strings.php b/sources/addon/tictac/lang/ru/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/ru/strings.php
rename to sources/addon/tictac/lang/ru/strings.php
diff --git a/sources/addons/tictac/lang/sv/strings.php b/sources/addon/tictac/lang/sv/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/sv/strings.php
rename to sources/addon/tictac/lang/sv/strings.php
diff --git a/sources/addons/tictac/lang/zh-cn/strings.php b/sources/addon/tictac/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/tictac/lang/zh-cn/strings.php
rename to sources/addon/tictac/lang/zh-cn/strings.php
diff --git a/sources/addons/tictac/tictac.apd b/sources/addon/tictac/tictac.apd
similarity index 100%
rename from sources/addons/tictac/tictac.apd
rename to sources/addon/tictac/tictac.apd
diff --git a/sources/addons/tictac/tictac.php b/sources/addon/tictac/tictac.php
similarity index 100%
rename from sources/addons/tictac/tictac.php
rename to sources/addon/tictac/tictac.php
diff --git a/sources/addons/tictac/tictac.png b/sources/addon/tictac/tictac.png
similarity index 100%
rename from sources/addons/tictac/tictac.png
rename to sources/addon/tictac/tictac.png
diff --git a/sources/addons/torch/torch.apd b/sources/addon/torch/torch.apd
similarity index 100%
rename from sources/addons/torch/torch.apd
rename to sources/addon/torch/torch.apd
diff --git a/sources/addons/torch/torch.php b/sources/addon/torch/torch.php
similarity index 100%
rename from sources/addons/torch/torch.php
rename to sources/addon/torch/torch.php
diff --git a/sources/addons/torch/torch.png b/sources/addon/torch/torch.png
similarity index 100%
rename from sources/addons/torch/torch.png
rename to sources/addon/torch/torch.png
diff --git a/sources/addons/tour/LICENSE b/sources/addon/tour/LICENSE
similarity index 100%
rename from sources/addons/tour/LICENSE
rename to sources/addon/tour/LICENSE
diff --git a/sources/addons/tour/README b/sources/addon/tour/README
similarity index 100%
rename from sources/addons/tour/README
rename to sources/addon/tour/README
diff --git a/sources/addons/tour/jquery-tourbus.min.css b/sources/addon/tour/jquery-tourbus.min.css
similarity index 100%
rename from sources/addons/tour/jquery-tourbus.min.css
rename to sources/addon/tour/jquery-tourbus.min.css
diff --git a/sources/addons/tour/jquery-tourbus.min.js b/sources/addon/tour/jquery-tourbus.min.js
similarity index 100%
rename from sources/addons/tour/jquery-tourbus.min.js
rename to sources/addon/tour/jquery-tourbus.min.js
diff --git a/sources/addons/tour/jquery.scrollTo.min.js b/sources/addon/tour/jquery.scrollTo.min.js
similarity index 100%
rename from sources/addons/tour/jquery.scrollTo.min.js
rename to sources/addon/tour/jquery.scrollTo.min.js
diff --git a/sources/addons/tour/tour.php b/sources/addon/tour/tour.php
similarity index 100%
rename from sources/addons/tour/tour.php
rename to sources/addon/tour/tour.php
diff --git a/sources/addons/twitter/LICENSE b/sources/addon/twitter/LICENSE
similarity index 100%
rename from sources/addons/twitter/LICENSE
rename to sources/addon/twitter/LICENSE
diff --git a/sources/addons/twitter/README.md b/sources/addon/twitter/README.md
similarity index 100%
rename from sources/addons/twitter/README.md
rename to sources/addon/twitter/README.md
diff --git a/sources/addons/twitter/cacert.pem b/sources/addon/twitter/cacert.pem
similarity index 100%
rename from sources/addons/twitter/cacert.pem
rename to sources/addon/twitter/cacert.pem
diff --git a/sources/addons/twitter/codebird.php b/sources/addon/twitter/codebird.php
similarity index 100%
rename from sources/addons/twitter/codebird.php
rename to sources/addon/twitter/codebird.php
diff --git a/sources/addons/twitter/lang/C/messages.po b/sources/addon/twitter/lang/C/messages.po
similarity index 100%
rename from sources/addons/twitter/lang/C/messages.po
rename to sources/addon/twitter/lang/C/messages.po
diff --git a/sources/addons/twitter/lang/ca/strings.php b/sources/addon/twitter/lang/ca/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/ca/strings.php
rename to sources/addon/twitter/lang/ca/strings.php
diff --git a/sources/addons/twitter/lang/cs/strings.php b/sources/addon/twitter/lang/cs/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/cs/strings.php
rename to sources/addon/twitter/lang/cs/strings.php
diff --git a/sources/addons/twitter/lang/de/strings.php b/sources/addon/twitter/lang/de/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/de/strings.php
rename to sources/addon/twitter/lang/de/strings.php
diff --git a/sources/addons/twitter/lang/eo/strings.php b/sources/addon/twitter/lang/eo/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/eo/strings.php
rename to sources/addon/twitter/lang/eo/strings.php
diff --git a/sources/addons/twitter/lang/es/strings.php b/sources/addon/twitter/lang/es/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/es/strings.php
rename to sources/addon/twitter/lang/es/strings.php
diff --git a/sources/addons/twitter/lang/fr/strings.php b/sources/addon/twitter/lang/fr/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/fr/strings.php
rename to sources/addon/twitter/lang/fr/strings.php
diff --git a/sources/addons/twitter/lang/is/strings.php b/sources/addon/twitter/lang/is/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/is/strings.php
rename to sources/addon/twitter/lang/is/strings.php
diff --git a/sources/addons/twitter/lang/it/strings.php b/sources/addon/twitter/lang/it/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/it/strings.php
rename to sources/addon/twitter/lang/it/strings.php
diff --git a/sources/addons/twitter/lang/nb-no/strings.php b/sources/addon/twitter/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/nb-no/strings.php
rename to sources/addon/twitter/lang/nb-no/strings.php
diff --git a/sources/addons/twitter/lang/nl/strings.php b/sources/addon/twitter/lang/nl/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/nl/strings.php
rename to sources/addon/twitter/lang/nl/strings.php
diff --git a/sources/addons/twitter/lang/pl/strings.php b/sources/addon/twitter/lang/pl/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/pl/strings.php
rename to sources/addon/twitter/lang/pl/strings.php
diff --git a/sources/addons/twitter/lang/pt-br/strings.php b/sources/addon/twitter/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/pt-br/strings.php
rename to sources/addon/twitter/lang/pt-br/strings.php
diff --git a/sources/addons/twitter/lang/ru/strings.php b/sources/addon/twitter/lang/ru/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/ru/strings.php
rename to sources/addon/twitter/lang/ru/strings.php
diff --git a/sources/addons/twitter/lang/sv/strings.php b/sources/addon/twitter/lang/sv/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/sv/strings.php
rename to sources/addon/twitter/lang/sv/strings.php
diff --git a/sources/addons/twitter/lang/zh-cn/strings.php b/sources/addon/twitter/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/twitter/lang/zh-cn/strings.php
rename to sources/addon/twitter/lang/zh-cn/strings.php
diff --git a/sources/addons/twitter/lighter.png b/sources/addon/twitter/lighter.png
similarity index 100%
rename from sources/addons/twitter/lighter.png
rename to sources/addon/twitter/lighter.png
diff --git a/sources/addons/twitter/twitter.css b/sources/addon/twitter/twitter.css
similarity index 100%
rename from sources/addons/twitter/twitter.css
rename to sources/addon/twitter/twitter.css
diff --git a/sources/addons/twitter/twitter.php b/sources/addon/twitter/twitter.php
similarity index 100%
rename from sources/addons/twitter/twitter.php
rename to sources/addon/twitter/twitter.php
diff --git a/sources/addons/twitter/twitter.png b/sources/addon/twitter/twitter.png
similarity index 100%
rename from sources/addons/twitter/twitter.png
rename to sources/addon/twitter/twitter.png
diff --git a/sources/addons/twitter/view/tpl/admin.tpl b/sources/addon/twitter/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/twitter/view/tpl/admin.tpl
rename to sources/addon/twitter/view/tpl/admin.tpl
diff --git a/sources/addons/upload_limits/upload_limits.php b/sources/addon/upload_limits/upload_limits.php
similarity index 100%
rename from sources/addons/upload_limits/upload_limits.php
rename to sources/addon/upload_limits/upload_limits.php
diff --git a/sources/addons/visage/visage.apd b/sources/addon/visage/visage.apd
similarity index 100%
rename from sources/addons/visage/visage.apd
rename to sources/addon/visage/visage.apd
diff --git a/sources/addons/visage/visage.css b/sources/addon/visage/visage.css
similarity index 100%
rename from sources/addons/visage/visage.css
rename to sources/addon/visage/visage.css
diff --git a/sources/addons/visage/visage.php b/sources/addon/visage/visage.php
similarity index 100%
rename from sources/addons/visage/visage.php
rename to sources/addon/visage/visage.php
diff --git a/sources/addons/visage/visage.png b/sources/addon/visage/visage.png
similarity index 100%
rename from sources/addons/visage/visage.png
rename to sources/addon/visage/visage.png
diff --git a/sources/addons/wholikesme/wholikesme.php b/sources/addon/wholikesme/wholikesme.php
similarity index 100%
rename from sources/addons/wholikesme/wholikesme.php
rename to sources/addon/wholikesme/wholikesme.php
diff --git a/sources/addons/wppost/lang/C/messages.po b/sources/addon/wppost/lang/C/messages.po
similarity index 100%
rename from sources/addons/wppost/lang/C/messages.po
rename to sources/addon/wppost/lang/C/messages.po
diff --git a/sources/addons/wppost/lang/ca/strings.php b/sources/addon/wppost/lang/ca/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/ca/strings.php
rename to sources/addon/wppost/lang/ca/strings.php
diff --git a/sources/addons/wppost/lang/cs/strings.php b/sources/addon/wppost/lang/cs/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/cs/strings.php
rename to sources/addon/wppost/lang/cs/strings.php
diff --git a/sources/addons/wppost/lang/de/strings.php b/sources/addon/wppost/lang/de/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/de/strings.php
rename to sources/addon/wppost/lang/de/strings.php
diff --git a/sources/addons/wppost/lang/eo/strings.php b/sources/addon/wppost/lang/eo/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/eo/strings.php
rename to sources/addon/wppost/lang/eo/strings.php
diff --git a/sources/addons/wppost/lang/es/strings.php b/sources/addon/wppost/lang/es/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/es/strings.php
rename to sources/addon/wppost/lang/es/strings.php
diff --git a/sources/addons/wppost/lang/fr/strings.php b/sources/addon/wppost/lang/fr/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/fr/strings.php
rename to sources/addon/wppost/lang/fr/strings.php
diff --git a/sources/addons/wppost/lang/is/strings.php b/sources/addon/wppost/lang/is/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/is/strings.php
rename to sources/addon/wppost/lang/is/strings.php
diff --git a/sources/addons/wppost/lang/it/strings.php b/sources/addon/wppost/lang/it/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/it/strings.php
rename to sources/addon/wppost/lang/it/strings.php
diff --git a/sources/addons/wppost/lang/nb-no/strings.php b/sources/addon/wppost/lang/nb-no/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/nb-no/strings.php
rename to sources/addon/wppost/lang/nb-no/strings.php
diff --git a/sources/addons/wppost/lang/nl/hstrings.php b/sources/addon/wppost/lang/nl/hstrings.php
similarity index 100%
rename from sources/addons/wppost/lang/nl/hstrings.php
rename to sources/addon/wppost/lang/nl/hstrings.php
diff --git a/sources/addons/wppost/lang/pl/strings.php b/sources/addon/wppost/lang/pl/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/pl/strings.php
rename to sources/addon/wppost/lang/pl/strings.php
diff --git a/sources/addons/wppost/lang/pt-br/strings.php b/sources/addon/wppost/lang/pt-br/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/pt-br/strings.php
rename to sources/addon/wppost/lang/pt-br/strings.php
diff --git a/sources/addons/wppost/lang/ru/strings.php b/sources/addon/wppost/lang/ru/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/ru/strings.php
rename to sources/addon/wppost/lang/ru/strings.php
diff --git a/sources/addons/wppost/lang/sv/strings.php b/sources/addon/wppost/lang/sv/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/sv/strings.php
rename to sources/addon/wppost/lang/sv/strings.php
diff --git a/sources/addons/wppost/lang/zh-cn/strings.php b/sources/addon/wppost/lang/zh-cn/strings.php
similarity index 100%
rename from sources/addons/wppost/lang/zh-cn/strings.php
rename to sources/addon/wppost/lang/zh-cn/strings.php
diff --git a/sources/addons/wppost/wordpress-logo.png b/sources/addon/wppost/wordpress-logo.png
similarity index 100%
rename from sources/addons/wppost/wordpress-logo.png
rename to sources/addon/wppost/wordpress-logo.png
diff --git a/sources/addons/wppost/wppost.css b/sources/addon/wppost/wppost.css
similarity index 100%
rename from sources/addons/wppost/wppost.css
rename to sources/addon/wppost/wppost.css
diff --git a/sources/addons/wppost/wppost.php b/sources/addon/wppost/wppost.php
similarity index 100%
rename from sources/addons/wppost/wppost.php
rename to sources/addon/wppost/wppost.php
diff --git a/sources/addons/xmpp/converse/CONTRIBUTING.rst b/sources/addon/xmpp/converse/CONTRIBUTING.rst
similarity index 100%
rename from sources/addons/xmpp/converse/CONTRIBUTING.rst
rename to sources/addon/xmpp/converse/CONTRIBUTING.rst
diff --git a/sources/addons/xmpp/converse/README.rst b/sources/addon/xmpp/converse/README.rst
similarity index 100%
rename from sources/addons/xmpp/converse/README.rst
rename to sources/addon/xmpp/converse/README.rst
diff --git a/sources/addons/xmpp/converse/builds/converse.min.js b/sources/addon/xmpp/converse/builds/converse.min.js
similarity index 100%
rename from sources/addons/xmpp/converse/builds/converse.min.js
rename to sources/addon/xmpp/converse/builds/converse.min.js
diff --git a/sources/addons/xmpp/converse/builds/locales.js b/sources/addon/xmpp/converse/builds/locales.js
similarity index 100%
rename from sources/addons/xmpp/converse/builds/locales.js
rename to sources/addon/xmpp/converse/builds/locales.js
diff --git a/sources/addons/xmpp/converse/builds/templates.js b/sources/addon/xmpp/converse/builds/templates.js
similarity index 100%
rename from sources/addons/xmpp/converse/builds/templates.js
rename to sources/addon/xmpp/converse/builds/templates.js
diff --git a/sources/addons/xmpp/converse/css/converse.css b/sources/addon/xmpp/converse/css/converse.css
similarity index 100%
rename from sources/addons/xmpp/converse/css/converse.css
rename to sources/addon/xmpp/converse/css/converse.css
diff --git a/sources/addons/xmpp/converse/css/converse.min.css b/sources/addon/xmpp/converse/css/converse.min.css
similarity index 100%
rename from sources/addons/xmpp/converse/css/converse.min.css
rename to sources/addon/xmpp/converse/css/converse.min.css
diff --git a/sources/addons/xmpp/converse/css/images/arrow.svg b/sources/addon/xmpp/converse/css/images/arrow.svg
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/arrow.svg
rename to sources/addon/xmpp/converse/css/images/arrow.svg
diff --git a/sources/addons/xmpp/converse/css/images/bgbl.svg b/sources/addon/xmpp/converse/css/images/bgbl.svg
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/bgbl.svg
rename to sources/addon/xmpp/converse/css/images/bgbl.svg
diff --git a/sources/addons/xmpp/converse/css/images/bgtr.svg b/sources/addon/xmpp/converse/css/images/bgtr.svg
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/bgtr.svg
rename to sources/addon/xmpp/converse/css/images/bgtr.svg
diff --git a/sources/addons/xmpp/converse/css/images/bitcoin_qr_code.png b/sources/addon/xmpp/converse/css/images/bitcoin_qr_code.png
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/bitcoin_qr_code.png
rename to sources/addon/xmpp/converse/css/images/bitcoin_qr_code.png
diff --git a/sources/addons/xmpp/converse/css/images/dark-arrow.svg b/sources/addon/xmpp/converse/css/images/dark-arrow.svg
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/dark-arrow.svg
rename to sources/addon/xmpp/converse/css/images/dark-arrow.svg
diff --git a/sources/addons/xmpp/converse/css/images/header.jpg b/sources/addon/xmpp/converse/css/images/header.jpg
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/header.jpg
rename to sources/addon/xmpp/converse/css/images/header.jpg
diff --git a/sources/addons/xmpp/converse/css/images/overlay.png b/sources/addon/xmpp/converse/css/images/overlay.png
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/overlay.png
rename to sources/addon/xmpp/converse/css/images/overlay.png
diff --git a/sources/addons/xmpp/converse/css/images/user.png b/sources/addon/xmpp/converse/css/images/user.png
similarity index 100%
rename from sources/addons/xmpp/converse/css/images/user.png
rename to sources/addon/xmpp/converse/css/images/user.png
diff --git a/sources/addons/xmpp/converse/css/theme.css b/sources/addon/xmpp/converse/css/theme.css
similarity index 100%
rename from sources/addons/xmpp/converse/css/theme.css
rename to sources/addon/xmpp/converse/css/theme.css
diff --git a/sources/addons/xmpp/converse/fonticons/Read Me.txt b/sources/addon/xmpp/converse/fonticons/Read Me.txt
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/Read Me.txt
rename to sources/addon/xmpp/converse/fonticons/Read Me.txt
diff --git a/sources/addons/xmpp/converse/fonticons/demo-files/demo.css b/sources/addon/xmpp/converse/fonticons/demo-files/demo.css
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/demo-files/demo.css
rename to sources/addon/xmpp/converse/fonticons/demo-files/demo.css
diff --git a/sources/addons/xmpp/converse/fonticons/demo-files/demo.js b/sources/addon/xmpp/converse/fonticons/demo-files/demo.js
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/demo-files/demo.js
rename to sources/addon/xmpp/converse/fonticons/demo-files/demo.js
diff --git a/sources/addons/xmpp/converse/fonticons/demo.html b/sources/addon/xmpp/converse/fonticons/demo.html
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/demo.html
rename to sources/addon/xmpp/converse/fonticons/demo.html
diff --git a/sources/addons/xmpp/converse/fonticons/fonts/icomoon.eot b/sources/addon/xmpp/converse/fonticons/fonts/icomoon.eot
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/fonts/icomoon.eot
rename to sources/addon/xmpp/converse/fonticons/fonts/icomoon.eot
diff --git a/sources/addons/xmpp/converse/fonticons/fonts/icomoon.svg b/sources/addon/xmpp/converse/fonticons/fonts/icomoon.svg
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/fonts/icomoon.svg
rename to sources/addon/xmpp/converse/fonticons/fonts/icomoon.svg
diff --git a/sources/addons/xmpp/converse/fonticons/fonts/icomoon.ttf b/sources/addon/xmpp/converse/fonticons/fonts/icomoon.ttf
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/fonts/icomoon.ttf
rename to sources/addon/xmpp/converse/fonticons/fonts/icomoon.ttf
diff --git a/sources/addons/xmpp/converse/fonticons/fonts/icomoon.woff b/sources/addon/xmpp/converse/fonticons/fonts/icomoon.woff
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/fonts/icomoon.woff
rename to sources/addon/xmpp/converse/fonticons/fonts/icomoon.woff
diff --git a/sources/addons/xmpp/converse/fonticons/selection.json b/sources/addon/xmpp/converse/fonticons/selection.json
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/selection.json
rename to sources/addon/xmpp/converse/fonticons/selection.json
diff --git a/sources/addons/xmpp/converse/fonticons/style.css b/sources/addon/xmpp/converse/fonticons/style.css
similarity index 100%
rename from sources/addons/xmpp/converse/fonticons/style.css
rename to sources/addon/xmpp/converse/fonticons/style.css
diff --git a/sources/addons/xmpp/converse/sounds/README b/sources/addon/xmpp/converse/sounds/README
similarity index 100%
rename from sources/addons/xmpp/converse/sounds/README
rename to sources/addon/xmpp/converse/sounds/README
diff --git a/sources/addons/xmpp/converse/sounds/msg_received.mp3 b/sources/addon/xmpp/converse/sounds/msg_received.mp3
similarity index 100%
rename from sources/addons/xmpp/converse/sounds/msg_received.mp3
rename to sources/addon/xmpp/converse/sounds/msg_received.mp3
diff --git a/sources/addons/xmpp/converse/sounds/msg_received.ogg b/sources/addon/xmpp/converse/sounds/msg_received.ogg
similarity index 100%
rename from sources/addons/xmpp/converse/sounds/msg_received.ogg
rename to sources/addon/xmpp/converse/sounds/msg_received.ogg
diff --git a/sources/addons/xmpp/view/tpl/admin.tpl b/sources/addon/xmpp/view/tpl/admin.tpl
similarity index 100%
rename from sources/addons/xmpp/view/tpl/admin.tpl
rename to sources/addon/xmpp/view/tpl/admin.tpl
diff --git a/sources/addons/xmpp/xmpp.css b/sources/addon/xmpp/xmpp.css
similarity index 100%
rename from sources/addons/xmpp/xmpp.css
rename to sources/addon/xmpp/xmpp.css
diff --git a/sources/addons/xmpp/xmpp.php b/sources/addon/xmpp/xmpp.php
similarity index 100%
rename from sources/addons/xmpp/xmpp.php
rename to sources/addon/xmpp/xmpp.php
diff --git a/sources/addons/xmpp/xmpp.png b/sources/addon/xmpp/xmpp.png
similarity index 100%
rename from sources/addons/xmpp/xmpp.png
rename to sources/addon/xmpp/xmpp.png
diff --git a/sources/addons/.gitignore b/sources/addons/.gitignore
deleted file mode 100644
index 5dade782..00000000
--- a/sources/addons/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-favicon.*
-.htconfig.php
-\#*
-*.log
-*.out
-*.version*
-favicon.*
-*~
-
-#ignore reports, should be generted with every build
-report/
-
-#ignore config files from eclipse, we don't want IDE files in our repository
-.project
-.buildpath
-.externalToolBuilders
-.settings
-#ignore OSX .DS_Store files 
-.DS_Store
-
-/nbproject/private/
-
-#Kdevelop project files
-*.kdev4
diff --git a/sources/addons/embedly/embedly.php b/sources/addons/embedly/embedly.php
deleted file mode 100644
index 924c21dd..00000000
--- a/sources/addons/embedly/embedly.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Name: Embedly
- * Description: Use oohemebed.com to resolve oembeds that can't be discovered directly
- * Version: 1.0
- * Author: Mike Macgirvin <mike@zothub.com>
- * 
- */
-
-function embedly_load() {
-	register_hook('oembed_probe','addon/embedly/embedly.php','embedly_oembed_probe');
-}
-
-function embedly_unload() {
-	unregister_hook('oembed_probe','addon/embedly/embedly.php','embedly_oembed_probe');
-}
-
-function embedly_oembed_probe($a,$b) {
-	// try oohembed service
-	$ourl = "http://oohembed.com/oohembed/?url=".$b['url'].'&maxwidth=' . $b['videowidth'];  
-	$result = z_fetch_url($ourl);
-	if($result['success'])
-		$b['embed'] = $result['body'];
-}
\ No newline at end of file