diff --git a/components/IWeaveCrypto.xpt b/crypto/components/IWeaveCrypto.xpt
similarity index 100%
rename from components/IWeaveCrypto.xpt
rename to crypto/components/IWeaveCrypto.xpt
diff --git a/platform/Darwin/components/WeaveCrypto.dylib b/crypto/platform/Darwin/components/WeaveCrypto.dylib
similarity index 100%
rename from platform/Darwin/components/WeaveCrypto.dylib
rename to crypto/platform/Darwin/components/WeaveCrypto.dylib
diff --git a/platform/Linux/components/WeaveCrypto.so b/crypto/platform/Linux/components/WeaveCrypto.so
similarity index 100%
rename from platform/Linux/components/WeaveCrypto.so
rename to crypto/platform/Linux/components/WeaveCrypto.so
diff --git a/platform/Linux_x86-gcc3/components/WeaveCrypto.so b/crypto/platform/Linux_x86-gcc3/components/WeaveCrypto.so
similarity index 100%
rename from platform/Linux_x86-gcc3/components/WeaveCrypto.so
rename to crypto/platform/Linux_x86-gcc3/components/WeaveCrypto.so
diff --git a/platform/Linux_x86_64-gcc3/components/WeaveCrypto.so b/crypto/platform/Linux_x86_64-gcc3/components/WeaveCrypto.so
similarity index 100%
rename from platform/Linux_x86_64-gcc3/components/WeaveCrypto.so
rename to crypto/platform/Linux_x86_64-gcc3/components/WeaveCrypto.so
diff --git a/platform/WINNT_x86-msvc/components/WeaveCrypto.dll b/crypto/platform/WINNT_x86-msvc/components/WeaveCrypto.dll
similarity index 100%
rename from platform/WINNT_x86-msvc/components/WeaveCrypto.dll
rename to crypto/platform/WINNT_x86-msvc/components/WeaveCrypto.dll
diff --git a/src/IWeaveCrypto.idl b/crypto/src/IWeaveCrypto.idl
similarity index 100%
rename from src/IWeaveCrypto.idl
rename to crypto/src/IWeaveCrypto.idl
diff --git a/src/Makefile b/crypto/src/Makefile
similarity index 100%
rename from src/Makefile
rename to crypto/src/Makefile
diff --git a/src/WeaveCrypto.cpp b/crypto/src/WeaveCrypto.cpp
similarity index 100%
rename from src/WeaveCrypto.cpp
rename to crypto/src/WeaveCrypto.cpp
diff --git a/src/WeaveCrypto.h b/crypto/src/WeaveCrypto.h
similarity index 100%
rename from src/WeaveCrypto.h
rename to crypto/src/WeaveCrypto.h
diff --git a/src/WeaveCrypto.rc.in b/crypto/src/WeaveCrypto.rc.in
similarity index 100%
rename from src/WeaveCrypto.rc.in
rename to crypto/src/WeaveCrypto.rc.in
diff --git a/src/WeaveCryptoModule.cpp b/crypto/src/WeaveCryptoModule.cpp
similarity index 100%
rename from src/WeaveCryptoModule.cpp
rename to crypto/src/WeaveCryptoModule.cpp
diff --git a/chrome.manifest.in b/source/chrome.manifest.in
similarity index 100%
rename from chrome.manifest.in
rename to source/chrome.manifest.in
diff --git a/chrome/content/EULA.xhtml b/source/chrome/content/EULA.xhtml
similarity index 100%
rename from chrome/content/EULA.xhtml
rename to source/chrome/content/EULA.xhtml
diff --git a/chrome/content/aboutpage/aboutpage.js b/source/chrome/content/aboutpage/aboutpage.js
similarity index 100%
rename from chrome/content/aboutpage/aboutpage.js
rename to source/chrome/content/aboutpage/aboutpage.js
diff --git a/chrome/content/aboutpage/img/bg.jpg b/source/chrome/content/aboutpage/img/bg.jpg
similarity index 100%
rename from chrome/content/aboutpage/img/bg.jpg
rename to source/chrome/content/aboutpage/img/bg.jpg
diff --git a/chrome/content/aboutpage/img/mozilla-labs-large.png b/source/chrome/content/aboutpage/img/mozilla-labs-large.png
similarity index 100%
rename from chrome/content/aboutpage/img/mozilla-labs-large.png
rename to source/chrome/content/aboutpage/img/mozilla-labs-large.png
diff --git a/chrome/content/aboutpage/img/otherpages-bg.jpg b/source/chrome/content/aboutpage/img/otherpages-bg.jpg
similarity index 100%
rename from chrome/content/aboutpage/img/otherpages-bg.jpg
rename to source/chrome/content/aboutpage/img/otherpages-bg.jpg
diff --git a/chrome/content/aboutpage/img/otherpages-circles.png b/source/chrome/content/aboutpage/img/otherpages-circles.png
similarity index 100%
rename from chrome/content/aboutpage/img/otherpages-circles.png
rename to source/chrome/content/aboutpage/img/otherpages-circles.png
diff --git a/chrome/content/aboutpage/img/otherpages-divider.png b/source/chrome/content/aboutpage/img/otherpages-divider.png
similarity index 100%
rename from chrome/content/aboutpage/img/otherpages-divider.png
rename to source/chrome/content/aboutpage/img/otherpages-divider.png
diff --git a/chrome/content/aboutpage/img/otherpages-table-sides.png b/source/chrome/content/aboutpage/img/otherpages-table-sides.png
similarity index 100%
rename from chrome/content/aboutpage/img/otherpages-table-sides.png
rename to source/chrome/content/aboutpage/img/otherpages-table-sides.png
diff --git a/chrome/content/aboutpage/img/otherpages-table-top.png b/source/chrome/content/aboutpage/img/otherpages-table-top.png
similarity index 100%
rename from chrome/content/aboutpage/img/otherpages-table-top.png
rename to source/chrome/content/aboutpage/img/otherpages-table-top.png
diff --git a/chrome/content/aboutpage/img/otherpages-waves.jpg b/source/chrome/content/aboutpage/img/otherpages-waves.jpg
similarity index 100%
rename from chrome/content/aboutpage/img/otherpages-waves.jpg
rename to source/chrome/content/aboutpage/img/otherpages-waves.jpg
diff --git a/chrome/content/aboutpage/img/weave-logo.png b/source/chrome/content/aboutpage/img/weave-logo.png
similarity index 100%
rename from chrome/content/aboutpage/img/weave-logo.png
rename to source/chrome/content/aboutpage/img/weave-logo.png
diff --git a/chrome/content/aboutpage/otherpages-divider.png b/source/chrome/content/aboutpage/otherpages-divider.png
similarity index 100%
rename from chrome/content/aboutpage/otherpages-divider.png
rename to source/chrome/content/aboutpage/otherpages-divider.png
diff --git a/chrome/content/aboutpage/otherpages-table-top.png b/source/chrome/content/aboutpage/otherpages-table-top.png
similarity index 100%
rename from chrome/content/aboutpage/otherpages-table-top.png
rename to source/chrome/content/aboutpage/otherpages-table-top.png
diff --git a/chrome/content/aboutpage/weave-logo.png b/source/chrome/content/aboutpage/weave-logo.png
similarity index 100%
rename from chrome/content/aboutpage/weave-logo.png
rename to source/chrome/content/aboutpage/weave-logo.png
diff --git a/chrome/content/aboutpage/weave.css b/source/chrome/content/aboutpage/weave.css
similarity index 100%
rename from chrome/content/aboutpage/weave.css
rename to source/chrome/content/aboutpage/weave.css
diff --git a/chrome/content/advanced.xul b/source/chrome/content/advanced.xul
similarity index 100%
rename from chrome/content/advanced.xul
rename to source/chrome/content/advanced.xul
diff --git a/chrome/content/authenticator.js b/source/chrome/content/authenticator.js
similarity index 100%
rename from chrome/content/authenticator.js
rename to source/chrome/content/authenticator.js
diff --git a/chrome/content/bookmark-menu-overlay.js b/source/chrome/content/bookmark-menu-overlay.js
similarity index 100%
rename from chrome/content/bookmark-menu-overlay.js
rename to source/chrome/content/bookmark-menu-overlay.js
diff --git a/chrome/content/default-log.txt b/source/chrome/content/default-log.txt
similarity index 100%
rename from chrome/content/default-log.txt
rename to source/chrome/content/default-log.txt
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-icons_222222_256x240.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-icons_222222_256x240.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_222222_256x240.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-icons_454545_256x240.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-icons_454545_256x240.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_454545_256x240.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-icons_888888_256x240.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-icons_888888_256x240.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_888888_256x240.png
diff --git a/chrome/content/ext/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to source/chrome/content/ext/jquery/css/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/chrome/content/ext/jquery/css/smoothness/jquery-ui-1.7.1.custom.css b/source/chrome/content/ext/jquery/css/smoothness/jquery-ui-1.7.1.custom.css
similarity index 100%
rename from chrome/content/ext/jquery/css/smoothness/jquery-ui-1.7.1.custom.css
rename to source/chrome/content/ext/jquery/css/smoothness/jquery-ui-1.7.1.custom.css
diff --git a/chrome/content/ext/jquery/index.html b/source/chrome/content/ext/jquery/index.html
similarity index 100%
rename from chrome/content/ext/jquery/index.html
rename to source/chrome/content/ext/jquery/index.html
diff --git a/chrome/content/ext/jquery/js/jquery-1.3.2.min.js b/source/chrome/content/ext/jquery/js/jquery-1.3.2.min.js
similarity index 100%
rename from chrome/content/ext/jquery/js/jquery-1.3.2.min.js
rename to source/chrome/content/ext/jquery/js/jquery-1.3.2.min.js
diff --git a/chrome/content/ext/jquery/js/jquery-ui-1.7.1.custom.min.js b/source/chrome/content/ext/jquery/js/jquery-ui-1.7.1.custom.min.js
similarity index 100%
rename from chrome/content/ext/jquery/js/jquery-ui-1.7.1.custom.min.js
rename to source/chrome/content/ext/jquery/js/jquery-ui-1.7.1.custom.min.js
diff --git a/chrome/content/fennec-preferences.xul b/source/chrome/content/fennec-preferences.xul
similarity index 100%
rename from chrome/content/fennec-preferences.xul
rename to source/chrome/content/fennec-preferences.xul
diff --git a/chrome/content/fennec-weave-overlay.js b/source/chrome/content/fennec-weave-overlay.js
similarity index 100%
rename from chrome/content/fennec-weave-overlay.js
rename to source/chrome/content/fennec-weave-overlay.js
diff --git a/chrome/content/fennec-weave-overlay.xul b/source/chrome/content/fennec-weave-overlay.xul
similarity index 100%
rename from chrome/content/fennec-weave-overlay.xul
rename to source/chrome/content/fennec-weave-overlay.xul
diff --git a/chrome/content/fennec.css b/source/chrome/content/fennec.css
similarity index 100%
rename from chrome/content/fennec.css
rename to source/chrome/content/fennec.css
diff --git a/chrome/content/fx-preferences.xul b/source/chrome/content/fx-preferences.xul
similarity index 100%
rename from chrome/content/fx-preferences.xul
rename to source/chrome/content/fx-preferences.xul
diff --git a/chrome/content/fx-weave-overlay.js b/source/chrome/content/fx-weave-overlay.js
similarity index 100%
rename from chrome/content/fx-weave-overlay.js
rename to source/chrome/content/fx-weave-overlay.js
diff --git a/chrome/content/fx-weave-overlay.xul b/source/chrome/content/fx-weave-overlay.xul
similarity index 100%
rename from chrome/content/fx-weave-overlay.xul
rename to source/chrome/content/fx-weave-overlay.xul
diff --git a/chrome/content/load-weave.js b/source/chrome/content/load-weave.js
similarity index 100%
rename from chrome/content/load-weave.js
rename to source/chrome/content/load-weave.js
diff --git a/chrome/content/log.js b/source/chrome/content/log.js
similarity index 100%
rename from chrome/content/log.js
rename to source/chrome/content/log.js
diff --git a/chrome/content/log.xul b/source/chrome/content/log.xul
similarity index 100%
rename from chrome/content/log.xul
rename to source/chrome/content/log.xul
diff --git a/chrome/content/login.css b/source/chrome/content/login.css
similarity index 100%
rename from chrome/content/login.css
rename to source/chrome/content/login.css
diff --git a/chrome/content/login.js b/source/chrome/content/login.js
similarity index 100%
rename from chrome/content/login.js
rename to source/chrome/content/login.js
diff --git a/chrome/content/login.xul b/source/chrome/content/login.xul
similarity index 100%
rename from chrome/content/login.xul
rename to source/chrome/content/login.xul
diff --git a/chrome/content/notification.css b/source/chrome/content/notification.css
similarity index 100%
rename from chrome/content/notification.css
rename to source/chrome/content/notification.css
diff --git a/chrome/content/notification.xml b/source/chrome/content/notification.xml
similarity index 100%
rename from chrome/content/notification.xml
rename to source/chrome/content/notification.xml
diff --git a/chrome/content/openid-listener.js b/source/chrome/content/openid-listener.js
similarity index 100%
rename from chrome/content/openid-listener.js
rename to source/chrome/content/openid-listener.js
diff --git a/chrome/content/openid-wait.xul b/source/chrome/content/openid-wait.xul
similarity index 100%
rename from chrome/content/openid-wait.xul
rename to source/chrome/content/openid-wait.xul
diff --git a/chrome/content/pick-sync.css b/source/chrome/content/pick-sync.css
similarity index 100%
rename from chrome/content/pick-sync.css
rename to source/chrome/content/pick-sync.css
diff --git a/chrome/content/pick-sync.js b/source/chrome/content/pick-sync.js
similarity index 100%
rename from chrome/content/pick-sync.js
rename to source/chrome/content/pick-sync.js
diff --git a/chrome/content/pick-sync.xul b/source/chrome/content/pick-sync.xul
similarity index 100%
rename from chrome/content/pick-sync.xul
rename to source/chrome/content/pick-sync.xul
diff --git a/chrome/content/preferences.css b/source/chrome/content/preferences.css
similarity index 100%
rename from chrome/content/preferences.css
rename to source/chrome/content/preferences.css
diff --git a/chrome/content/preferences.js b/source/chrome/content/preferences.js
similarity index 100%
rename from chrome/content/preferences.js
rename to source/chrome/content/preferences.js
diff --git a/chrome/content/share.js b/source/chrome/content/share.js
similarity index 100%
rename from chrome/content/share.js
rename to source/chrome/content/share.js
diff --git a/chrome/content/share.xul b/source/chrome/content/share.xul
similarity index 100%
rename from chrome/content/share.xul
rename to source/chrome/content/share.xul
diff --git a/chrome/content/sm-preferences.xul b/source/chrome/content/sm-preferences.xul
similarity index 100%
rename from chrome/content/sm-preferences.xul
rename to source/chrome/content/sm-preferences.xul
diff --git a/chrome/content/status.css b/source/chrome/content/status.css
similarity index 100%
rename from chrome/content/status.css
rename to source/chrome/content/status.css
diff --git a/chrome/content/status.js b/source/chrome/content/status.js
similarity index 100%
rename from chrome/content/status.js
rename to source/chrome/content/status.js
diff --git a/chrome/content/status.xul b/source/chrome/content/status.xul
similarity index 100%
rename from chrome/content/status.xul
rename to source/chrome/content/status.xul
diff --git a/chrome/content/sync.css b/source/chrome/content/sync.css
similarity index 100%
rename from chrome/content/sync.css
rename to source/chrome/content/sync.css
diff --git a/chrome/content/sync.js b/source/chrome/content/sync.js
similarity index 100%
rename from chrome/content/sync.js
rename to source/chrome/content/sync.js
diff --git a/chrome/content/sync.xul b/source/chrome/content/sync.xul
similarity index 100%
rename from chrome/content/sync.xul
rename to source/chrome/content/sync.xul
diff --git a/chrome/content/tabs.xml b/source/chrome/content/tabs.xml
similarity index 100%
rename from chrome/content/tabs.xml
rename to source/chrome/content/tabs.xml
diff --git a/chrome/content/tb-weave-overlay.js b/source/chrome/content/tb-weave-overlay.js
similarity index 100%
rename from chrome/content/tb-weave-overlay.js
rename to source/chrome/content/tb-weave-overlay.js
diff --git a/chrome/content/tb-weave-overlay.xul b/source/chrome/content/tb-weave-overlay.xul
similarity index 100%
rename from chrome/content/tb-weave-overlay.xul
rename to source/chrome/content/tb-weave-overlay.xul
diff --git a/chrome/content/weave.html b/source/chrome/content/weave.html
similarity index 100%
rename from chrome/content/weave.html
rename to source/chrome/content/weave.html
diff --git a/chrome/content/wizard.css b/source/chrome/content/wizard.css
similarity index 100%
rename from chrome/content/wizard.css
rename to source/chrome/content/wizard.css
diff --git a/chrome/content/wizard.js b/source/chrome/content/wizard.js
similarity index 100%
rename from chrome/content/wizard.js
rename to source/chrome/content/wizard.js
diff --git a/chrome/content/wizard.xul b/source/chrome/content/wizard.xul
similarity index 100%
rename from chrome/content/wizard.xul
rename to source/chrome/content/wizard.xul
diff --git a/chrome/locale/en-US/fennec.properties b/source/chrome/locale/en-US/fennec.properties
similarity index 100%
rename from chrome/locale/en-US/fennec.properties
rename to source/chrome/locale/en-US/fennec.properties
diff --git a/chrome/locale/en-US/log.dtd b/source/chrome/locale/en-US/log.dtd
similarity index 100%
rename from chrome/locale/en-US/log.dtd
rename to source/chrome/locale/en-US/log.dtd
diff --git a/chrome/locale/en-US/log.properties b/source/chrome/locale/en-US/log.properties
similarity index 100%
rename from chrome/locale/en-US/log.properties
rename to source/chrome/locale/en-US/log.properties
diff --git a/chrome/locale/en-US/login.dtd b/source/chrome/locale/en-US/login.dtd
similarity index 100%
rename from chrome/locale/en-US/login.dtd
rename to source/chrome/locale/en-US/login.dtd
diff --git a/chrome/locale/en-US/login.properties b/source/chrome/locale/en-US/login.properties
similarity index 100%
rename from chrome/locale/en-US/login.properties
rename to source/chrome/locale/en-US/login.properties
diff --git a/chrome/locale/en-US/notification.dtd b/source/chrome/locale/en-US/notification.dtd
similarity index 100%
rename from chrome/locale/en-US/notification.dtd
rename to source/chrome/locale/en-US/notification.dtd
diff --git a/chrome/locale/en-US/oauth.dtd b/source/chrome/locale/en-US/oauth.dtd
similarity index 100%
rename from chrome/locale/en-US/oauth.dtd
rename to source/chrome/locale/en-US/oauth.dtd
diff --git a/chrome/locale/en-US/oauth.properties b/source/chrome/locale/en-US/oauth.properties
similarity index 100%
rename from chrome/locale/en-US/oauth.properties
rename to source/chrome/locale/en-US/oauth.properties
diff --git a/chrome/locale/en-US/pick-sync.properties b/source/chrome/locale/en-US/pick-sync.properties
similarity index 100%
rename from chrome/locale/en-US/pick-sync.properties
rename to source/chrome/locale/en-US/pick-sync.properties
diff --git a/chrome/locale/en-US/preferences.dtd b/source/chrome/locale/en-US/preferences.dtd
similarity index 100%
rename from chrome/locale/en-US/preferences.dtd
rename to source/chrome/locale/en-US/preferences.dtd
diff --git a/chrome/locale/en-US/preferences.properties b/source/chrome/locale/en-US/preferences.properties
similarity index 100%
rename from chrome/locale/en-US/preferences.properties
rename to source/chrome/locale/en-US/preferences.properties
diff --git a/chrome/locale/en-US/share.dtd b/source/chrome/locale/en-US/share.dtd
similarity index 100%
rename from chrome/locale/en-US/share.dtd
rename to source/chrome/locale/en-US/share.dtd
diff --git a/chrome/locale/en-US/share.properties b/source/chrome/locale/en-US/share.properties
similarity index 100%
rename from chrome/locale/en-US/share.properties
rename to source/chrome/locale/en-US/share.properties
diff --git a/chrome/locale/en-US/status.dtd b/source/chrome/locale/en-US/status.dtd
similarity index 100%
rename from chrome/locale/en-US/status.dtd
rename to source/chrome/locale/en-US/status.dtd
diff --git a/chrome/locale/en-US/status.properties b/source/chrome/locale/en-US/status.properties
similarity index 100%
rename from chrome/locale/en-US/status.properties
rename to source/chrome/locale/en-US/status.properties
diff --git a/chrome/locale/en-US/sync.dtd b/source/chrome/locale/en-US/sync.dtd
similarity index 100%
rename from chrome/locale/en-US/sync.dtd
rename to source/chrome/locale/en-US/sync.dtd
diff --git a/chrome/locale/en-US/sync.properties b/source/chrome/locale/en-US/sync.properties
similarity index 100%
rename from chrome/locale/en-US/sync.properties
rename to source/chrome/locale/en-US/sync.properties
diff --git a/chrome/locale/en-US/wizard.dtd b/source/chrome/locale/en-US/wizard.dtd
similarity index 100%
rename from chrome/locale/en-US/wizard.dtd
rename to source/chrome/locale/en-US/wizard.dtd
diff --git a/chrome/locale/en-US/wizard.properties b/source/chrome/locale/en-US/wizard.properties
similarity index 100%
rename from chrome/locale/en-US/wizard.properties
rename to source/chrome/locale/en-US/wizard.properties
diff --git a/chrome/skin/auth-auto.png b/source/chrome/skin/auth-auto.png
similarity index 100%
rename from chrome/skin/auth-auto.png
rename to source/chrome/skin/auth-auto.png
diff --git a/chrome/skin/auth-disabled.png b/source/chrome/skin/auth-disabled.png
similarity index 100%
rename from chrome/skin/auth-disabled.png
rename to source/chrome/skin/auth-disabled.png
diff --git a/chrome/skin/auth-enabled.png b/source/chrome/skin/auth-enabled.png
similarity index 100%
rename from chrome/skin/auth-enabled.png
rename to source/chrome/skin/auth-enabled.png
diff --git a/chrome/skin/bubbles/bubbleEx-190.png b/source/chrome/skin/bubbles/bubbleEx-190.png
similarity index 100%
rename from chrome/skin/bubbles/bubbleEx-190.png
rename to source/chrome/skin/bubbles/bubbleEx-190.png
diff --git a/chrome/skin/bubbles/bubbleEx-250.png b/source/chrome/skin/bubbles/bubbleEx-250.png
similarity index 100%
rename from chrome/skin/bubbles/bubbleEx-250.png
rename to source/chrome/skin/bubbles/bubbleEx-250.png
diff --git a/chrome/skin/button-down.png b/source/chrome/skin/button-down.png
similarity index 100%
rename from chrome/skin/button-down.png
rename to source/chrome/skin/button-down.png
diff --git a/chrome/skin/button-up.png b/source/chrome/skin/button-up.png
similarity index 100%
rename from chrome/skin/button-up.png
rename to source/chrome/skin/button-up.png
diff --git a/chrome/skin/cbox-check.gif b/source/chrome/skin/cbox-check.gif
similarity index 100%
rename from chrome/skin/cbox-check.gif
rename to source/chrome/skin/cbox-check.gif
diff --git a/chrome/skin/lock-closed.png b/source/chrome/skin/lock-closed.png
similarity index 100%
rename from chrome/skin/lock-closed.png
rename to source/chrome/skin/lock-closed.png
diff --git a/chrome/skin/lock-open.png b/source/chrome/skin/lock-open.png
similarity index 100%
rename from chrome/skin/lock-open.png
rename to source/chrome/skin/lock-open.png
diff --git a/chrome/skin/mozchomp.gif b/source/chrome/skin/mozchomp.gif
similarity index 100%
rename from chrome/skin/mozchomp.gif
rename to source/chrome/skin/mozchomp.gif
diff --git a/chrome/skin/shared-folder-16x16.png b/source/chrome/skin/shared-folder-16x16.png
similarity index 100%
rename from chrome/skin/shared-folder-16x16.png
rename to source/chrome/skin/shared-folder-16x16.png
diff --git a/chrome/skin/sync-16x16.png b/source/chrome/skin/sync-16x16.png
similarity index 100%
rename from chrome/skin/sync-16x16.png
rename to source/chrome/skin/sync-16x16.png
diff --git a/chrome/skin/sync-32x32.png b/source/chrome/skin/sync-32x32.png
similarity index 100%
rename from chrome/skin/sync-32x32.png
rename to source/chrome/skin/sync-32x32.png
diff --git a/chrome/skin/sync-throbber-16x16-active.apng b/source/chrome/skin/sync-throbber-16x16-active.apng
similarity index 100%
rename from chrome/skin/sync-throbber-16x16-active.apng
rename to source/chrome/skin/sync-throbber-16x16-active.apng
diff --git a/chrome/skin/sync-throbber-16x16-error.png b/source/chrome/skin/sync-throbber-16x16-error.png
similarity index 100%
rename from chrome/skin/sync-throbber-16x16-error.png
rename to source/chrome/skin/sync-throbber-16x16-error.png
diff --git a/chrome/skin/sync-throbber-16x16-inactive.png b/source/chrome/skin/sync-throbber-16x16-inactive.png
similarity index 100%
rename from chrome/skin/sync-throbber-16x16-inactive.png
rename to source/chrome/skin/sync-throbber-16x16-inactive.png
diff --git a/chrome/skin/sync-throbber-16x16.png b/source/chrome/skin/sync-throbber-16x16.png
similarity index 100%
rename from chrome/skin/sync-throbber-16x16.png
rename to source/chrome/skin/sync-throbber-16x16.png
diff --git a/chrome/skin/sync-throbber-24x24-active.apng b/source/chrome/skin/sync-throbber-24x24-active.apng
similarity index 100%
rename from chrome/skin/sync-throbber-24x24-active.apng
rename to source/chrome/skin/sync-throbber-24x24-active.apng
diff --git a/chrome/skin/sync-throbber-24x24-inactive.png b/source/chrome/skin/sync-throbber-24x24-inactive.png
similarity index 100%
rename from chrome/skin/sync-throbber-24x24-inactive.png
rename to source/chrome/skin/sync-throbber-24x24-inactive.png
diff --git a/chrome/skin/unshare-folder-16x16.png b/source/chrome/skin/unshare-folder-16x16.png
similarity index 100%
rename from chrome/skin/unshare-folder-16x16.png
rename to source/chrome/skin/unshare-folder-16x16.png
diff --git a/chrome/skin/weave-active-64.png b/source/chrome/skin/weave-active-64.png
similarity index 100%
rename from chrome/skin/weave-active-64.png
rename to source/chrome/skin/weave-active-64.png
diff --git a/chrome/skin/weave-default-64.png b/source/chrome/skin/weave-default-64.png
similarity index 100%
rename from chrome/skin/weave-default-64.png
rename to source/chrome/skin/weave-default-64.png
diff --git a/chrome/skin/wizard-background.png b/source/chrome/skin/wizard-background.png
similarity index 100%
rename from chrome/skin/wizard-background.png
rename to source/chrome/skin/wizard-background.png
diff --git a/components/Weave.js b/source/components/Weave.js
similarity index 100%
rename from components/Weave.js
rename to source/components/Weave.js
diff --git a/defaults/preferences/sync.js b/source/defaults/preferences/sync.js
similarity index 100%
rename from defaults/preferences/sync.js
rename to source/defaults/preferences/sync.js
diff --git a/install.rdf.in b/source/install.rdf.in
similarity index 100%
rename from install.rdf.in
rename to source/install.rdf.in
diff --git a/modules/auth.js b/source/modules/auth.js
similarity index 100%
rename from modules/auth.js
rename to source/modules/auth.js
diff --git a/modules/base_records/collection.js b/source/modules/base_records/collection.js
similarity index 100%
rename from modules/base_records/collection.js
rename to source/modules/base_records/collection.js
diff --git a/modules/base_records/crypto.js b/source/modules/base_records/crypto.js
similarity index 100%
rename from modules/base_records/crypto.js
rename to source/modules/base_records/crypto.js
diff --git a/modules/base_records/keys.js b/source/modules/base_records/keys.js
similarity index 100%
rename from modules/base_records/keys.js
rename to source/modules/base_records/keys.js
diff --git a/modules/base_records/wbo.js b/source/modules/base_records/wbo.js
similarity index 100%
rename from modules/base_records/wbo.js
rename to source/modules/base_records/wbo.js
diff --git a/modules/constants.js.in b/source/modules/constants.js.in
similarity index 100%
rename from modules/constants.js.in
rename to source/modules/constants.js.in
diff --git a/modules/engines.js b/source/modules/engines.js
similarity index 100%
rename from modules/engines.js
rename to source/modules/engines.js
diff --git a/modules/engines/bookmarks.js b/source/modules/engines/bookmarks.js
similarity index 100%
rename from modules/engines/bookmarks.js
rename to source/modules/engines/bookmarks.js
diff --git a/modules/engines/clientData.js b/source/modules/engines/clientData.js
similarity index 100%
rename from modules/engines/clientData.js
rename to source/modules/engines/clientData.js
diff --git a/modules/engines/cookies.js b/source/modules/engines/cookies.js
similarity index 100%
rename from modules/engines/cookies.js
rename to source/modules/engines/cookies.js
diff --git a/modules/engines/extensions.js b/source/modules/engines/extensions.js
similarity index 100%
rename from modules/engines/extensions.js
rename to source/modules/engines/extensions.js
diff --git a/modules/engines/forms.js b/source/modules/engines/forms.js
similarity index 100%
rename from modules/engines/forms.js
rename to source/modules/engines/forms.js
diff --git a/modules/engines/history.js b/source/modules/engines/history.js
similarity index 100%
rename from modules/engines/history.js
rename to source/modules/engines/history.js
diff --git a/modules/engines/input.js b/source/modules/engines/input.js
similarity index 100%
rename from modules/engines/input.js
rename to source/modules/engines/input.js
diff --git a/modules/engines/microformats.js b/source/modules/engines/microformats.js
similarity index 100%
rename from modules/engines/microformats.js
rename to source/modules/engines/microformats.js
diff --git a/modules/engines/passwords.js b/source/modules/engines/passwords.js
similarity index 100%
rename from modules/engines/passwords.js
rename to source/modules/engines/passwords.js
diff --git a/modules/engines/plugins.js b/source/modules/engines/plugins.js
similarity index 100%
rename from modules/engines/plugins.js
rename to source/modules/engines/plugins.js
diff --git a/modules/engines/prefs.js b/source/modules/engines/prefs.js
similarity index 100%
rename from modules/engines/prefs.js
rename to source/modules/engines/prefs.js
diff --git a/modules/engines/tabs.js b/source/modules/engines/tabs.js
similarity index 100%
rename from modules/engines/tabs.js
rename to source/modules/engines/tabs.js
diff --git a/modules/engines/themes.js b/source/modules/engines/themes.js
similarity index 100%
rename from modules/engines/themes.js
rename to source/modules/engines/themes.js
diff --git a/modules/ext/Observers.js b/source/modules/ext/Observers.js
similarity index 100%
rename from modules/ext/Observers.js
rename to source/modules/ext/Observers.js
diff --git a/modules/ext/Preferences.js b/source/modules/ext/Preferences.js
similarity index 100%
rename from modules/ext/Preferences.js
rename to source/modules/ext/Preferences.js
diff --git a/modules/ext/Sync.js b/source/modules/ext/Sync.js
similarity index 100%
rename from modules/ext/Sync.js
rename to source/modules/ext/Sync.js
diff --git a/modules/faultTolerance.js b/source/modules/faultTolerance.js
similarity index 100%
rename from modules/faultTolerance.js
rename to source/modules/faultTolerance.js
diff --git a/modules/identity.js b/source/modules/identity.js
similarity index 100%
rename from modules/identity.js
rename to source/modules/identity.js
diff --git a/modules/log4moz.js b/source/modules/log4moz.js
similarity index 100%
rename from modules/log4moz.js
rename to source/modules/log4moz.js
diff --git a/modules/notifications.js b/source/modules/notifications.js
similarity index 100%
rename from modules/notifications.js
rename to source/modules/notifications.js
diff --git a/modules/resource.js b/source/modules/resource.js
similarity index 100%
rename from modules/resource.js
rename to source/modules/resource.js
diff --git a/modules/service.js b/source/modules/service.js
similarity index 100%
rename from modules/service.js
rename to source/modules/service.js
diff --git a/modules/stores.js b/source/modules/stores.js
similarity index 100%
rename from modules/stores.js
rename to source/modules/stores.js
diff --git a/modules/trackers.js b/source/modules/trackers.js
similarity index 100%
rename from modules/trackers.js
rename to source/modules/trackers.js
diff --git a/modules/type_records/bookmark.js b/source/modules/type_records/bookmark.js
similarity index 100%
rename from modules/type_records/bookmark.js
rename to source/modules/type_records/bookmark.js
diff --git a/modules/type_records/clientData.js b/source/modules/type_records/clientData.js
similarity index 100%
rename from modules/type_records/clientData.js
rename to source/modules/type_records/clientData.js
diff --git a/modules/type_records/forms.js b/source/modules/type_records/forms.js
similarity index 100%
rename from modules/type_records/forms.js
rename to source/modules/type_records/forms.js
diff --git a/modules/type_records/history.js b/source/modules/type_records/history.js
similarity index 100%
rename from modules/type_records/history.js
rename to source/modules/type_records/history.js
diff --git a/modules/type_records/passwords.js b/source/modules/type_records/passwords.js
similarity index 100%
rename from modules/type_records/passwords.js
rename to source/modules/type_records/passwords.js
diff --git a/modules/type_records/prefs.js b/source/modules/type_records/prefs.js
similarity index 100%
rename from modules/type_records/prefs.js
rename to source/modules/type_records/prefs.js
diff --git a/modules/type_records/tabs.js b/source/modules/type_records/tabs.js
similarity index 100%
rename from modules/type_records/tabs.js
rename to source/modules/type_records/tabs.js
diff --git a/modules/util.js b/source/modules/util.js
similarity index 100%
rename from modules/util.js
rename to source/modules/util.js
diff --git a/modules/xmpp/authenticationLayer.js b/source/modules/xmpp/authenticationLayer.js
similarity index 100%
rename from modules/xmpp/authenticationLayer.js
rename to source/modules/xmpp/authenticationLayer.js
diff --git a/modules/xmpp/readme.txt b/source/modules/xmpp/readme.txt
similarity index 100%
rename from modules/xmpp/readme.txt
rename to source/modules/xmpp/readme.txt
diff --git a/modules/xmpp/transportLayer.js b/source/modules/xmpp/transportLayer.js
similarity index 100%
rename from modules/xmpp/transportLayer.js
rename to source/modules/xmpp/transportLayer.js
diff --git a/modules/xmpp/xmppClient.js b/source/modules/xmpp/xmppClient.js
similarity index 100%
rename from modules/xmpp/xmppClient.js
rename to source/modules/xmpp/xmppClient.js
diff --git a/build/build_cross_platform_xpi.py b/tools/build/build_cross_platform_xpi.py
similarity index 100%
rename from build/build_cross_platform_xpi.py
rename to tools/build/build_cross_platform_xpi.py
diff --git a/docs/docs.css b/tools/docs/docs.css
similarity index 100%
rename from docs/docs.css
rename to tools/docs/docs.css
diff --git a/docs/docs.js b/tools/docs/docs.js
similarity index 100%
rename from docs/docs.js
rename to tools/docs/docs.js
diff --git a/docs/jquery.dynacloud-5.js b/tools/docs/jquery.dynacloud-5.js
similarity index 100%
rename from docs/jquery.dynacloud-5.js
rename to tools/docs/jquery.dynacloud-5.js
diff --git a/docs/prettify.css b/tools/docs/prettify.css
similarity index 100%
rename from docs/prettify.css
rename to tools/docs/prettify.css
diff --git a/docs/prettify.js b/tools/docs/prettify.js
similarity index 100%
rename from docs/prettify.js
rename to tools/docs/prettify.js
diff --git a/docs/wikicreole.js b/tools/docs/wikicreole.js
similarity index 100%
rename from docs/wikicreole.js
rename to tools/docs/wikicreole.js
diff --git a/index.html b/tools/index.html
similarity index 100%
rename from index.html
rename to tools/index.html
diff --git a/scripts/build-universal-sdk.sh b/tools/scripts/build-universal-sdk.sh
similarity index 100%
rename from scripts/build-universal-sdk.sh
rename to tools/scripts/build-universal-sdk.sh
diff --git a/scripts/getnose.py b/tools/scripts/getnose.py
similarity index 100%
rename from scripts/getnose.py
rename to tools/scripts/getnose.py
diff --git a/scripts/json.py b/tools/scripts/json.py
similarity index 100%
rename from scripts/json.py
rename to tools/scripts/json.py
diff --git a/scripts/manage.py b/tools/scripts/manage.py
similarity index 100%
rename from scripts/manage.py
rename to tools/scripts/manage.py
diff --git a/scripts/runtests.py b/tools/scripts/runtests.py
similarity index 100%
rename from scripts/runtests.py
rename to tools/scripts/runtests.py
diff --git a/scripts/share.py b/tools/scripts/share.py
similarity index 100%
rename from scripts/share.py
rename to tools/scripts/share.py
diff --git a/scripts/test_share.py b/tools/scripts/test_share.py
similarity index 100%
rename from scripts/test_share.py
rename to tools/scripts/test_share.py
diff --git a/scripts/weave_server.py b/tools/scripts/weave_server.py
similarity index 100%
rename from scripts/weave_server.py
rename to tools/scripts/weave_server.py
diff --git a/scripts/weave_server_tester.py b/tools/scripts/weave_server_tester.py
similarity index 100%
rename from scripts/weave_server_tester.py
rename to tools/scripts/weave_server_tester.py