diff --git a/include/Scrape.php b/include/Scrape.php
index 553bd529b2..698ec9cf04 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -442,7 +442,7 @@ function probe_url($url) {
 
 			if(x($feedret,'photo'))
 				$vcard['photo'] = $feedret['photo'];
-			require_once('simplepie/simplepie.inc');
+			require_once('library/simplepie/simplepie.inc');
 		    $feed = new SimplePie();
 			$xml = fetch_url($poll);
 
diff --git a/include/expire.php b/include/expire.php
index 3c30e01c1b..cf3b7c8e2d 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -16,9 +16,9 @@ function expire_run($argv, $argc){
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
 
-	require_once('session.php');
-	require_once('datetime.php');
-	require_once('simplepie/simplepie.inc');
+	require_once('include/session.php');
+	require_once('include/datetime.php');
+	require_once('library/simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 
diff --git a/include/items.php b/include/items.php
index 47a38d5e50..63e180f761 100644
--- a/include/items.php
+++ b/include/items.php
@@ -995,7 +995,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_feed = false) {
 
-	require_once('simplepie/simplepie.inc');
+	require_once('library/simplepie/simplepie.inc');
 
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
diff --git a/include/poller.php b/include/poller.php
index 7490bfa819..99517a7ee8 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -17,9 +17,9 @@ function poller_run($argv, $argc){
   	};
 
 
-	require_once('session.php');
-	require_once('datetime.php');
-	require_once('simplepie/simplepie.inc');
+	require_once('include/session.php');
+	require_once('include/datetime.php');
+	require_once('library/simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 	require_once('include/email.php');
diff --git a/include/salmon.php b/include/salmon.php
index 74da98c93c..c1af1a8526 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -145,9 +145,9 @@ EOT;
 
 	// Setup RSA stuff to PKCS#1 sign the data
 
-	set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
+	set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
 
-	require_once('phpsec/Crypt/RSA.php');
+	require_once('library/phpsec/Crypt/RSA.php');
 
     $rsa = new CRYPT_RSA();
     $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
diff --git a/cropper/cropper.css b/library/cropper/cropper.css
similarity index 100%
rename from cropper/cropper.css
rename to library/cropper/cropper.css
diff --git a/cropper/cropper.html b/library/cropper/cropper.html
similarity index 100%
rename from cropper/cropper.html
rename to library/cropper/cropper.html
diff --git a/cropper/cropper.js b/library/cropper/cropper.js
similarity index 100%
rename from cropper/cropper.js
rename to library/cropper/cropper.js
diff --git a/cropper/cropper.uncompressed.js b/library/cropper/cropper.uncompressed.js
similarity index 100%
rename from cropper/cropper.uncompressed.js
rename to library/cropper/cropper.uncompressed.js
diff --git a/cropper/lib/builder.js b/library/cropper/lib/builder.js
similarity index 100%
rename from cropper/lib/builder.js
rename to library/cropper/lib/builder.js
diff --git a/cropper/lib/controls.js b/library/cropper/lib/controls.js
similarity index 100%
rename from cropper/lib/controls.js
rename to library/cropper/lib/controls.js
diff --git a/cropper/lib/dragdrop.js b/library/cropper/lib/dragdrop.js
similarity index 100%
rename from cropper/lib/dragdrop.js
rename to library/cropper/lib/dragdrop.js
diff --git a/cropper/lib/effects.js b/library/cropper/lib/effects.js
similarity index 100%
rename from cropper/lib/effects.js
rename to library/cropper/lib/effects.js
diff --git a/cropper/lib/prototype.js b/library/cropper/lib/prototype.js
similarity index 100%
rename from cropper/lib/prototype.js
rename to library/cropper/lib/prototype.js
diff --git a/cropper/lib/scriptaculous.js b/library/cropper/lib/scriptaculous.js
similarity index 100%
rename from cropper/lib/scriptaculous.js
rename to library/cropper/lib/scriptaculous.js
diff --git a/cropper/lib/slider.js b/library/cropper/lib/slider.js
similarity index 100%
rename from cropper/lib/slider.js
rename to library/cropper/lib/slider.js
diff --git a/cropper/lib/unittest.js b/library/cropper/lib/unittest.js
similarity index 100%
rename from cropper/lib/unittest.js
rename to library/cropper/lib/unittest.js
diff --git a/cropper/licence.txt b/library/cropper/licence.txt
similarity index 100%
rename from cropper/licence.txt
rename to library/cropper/licence.txt
diff --git a/cropper/marqueeHoriz.gif b/library/cropper/marqueeHoriz.gif
similarity index 100%
rename from cropper/marqueeHoriz.gif
rename to library/cropper/marqueeHoriz.gif
diff --git a/cropper/marqueeVert.gif b/library/cropper/marqueeVert.gif
similarity index 100%
rename from cropper/marqueeVert.gif
rename to library/cropper/marqueeVert.gif
diff --git a/cropper/tests/castle.jpg b/library/cropper/tests/castle.jpg
similarity index 100%
rename from cropper/tests/castle.jpg
rename to library/cropper/tests/castle.jpg
diff --git a/cropper/tests/castleMed.jpg b/library/cropper/tests/castleMed.jpg
similarity index 100%
rename from cropper/tests/castleMed.jpg
rename to library/cropper/tests/castleMed.jpg
diff --git a/cropper/tests/example-Basic.htm b/library/cropper/tests/example-Basic.htm
similarity index 100%
rename from cropper/tests/example-Basic.htm
rename to library/cropper/tests/example-Basic.htm
diff --git a/cropper/tests/example-CSS-Absolute.htm b/library/cropper/tests/example-CSS-Absolute.htm
similarity index 100%
rename from cropper/tests/example-CSS-Absolute.htm
rename to library/cropper/tests/example-CSS-Absolute.htm
diff --git a/cropper/tests/example-CSS-Float.htm b/library/cropper/tests/example-CSS-Float.htm
similarity index 100%
rename from cropper/tests/example-CSS-Float.htm
rename to library/cropper/tests/example-CSS-Float.htm
diff --git a/cropper/tests/example-CSS-Relative.htm b/library/cropper/tests/example-CSS-Relative.htm
similarity index 100%
rename from cropper/tests/example-CSS-Relative.htm
rename to library/cropper/tests/example-CSS-Relative.htm
diff --git a/cropper/tests/example-CoordsOnLoad.htm b/library/cropper/tests/example-CoordsOnLoad.htm
similarity index 100%
rename from cropper/tests/example-CoordsOnLoad.htm
rename to library/cropper/tests/example-CoordsOnLoad.htm
diff --git a/cropper/tests/example-CoordsOnLoadWithRatio.htm b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm
similarity index 100%
rename from cropper/tests/example-CoordsOnLoadWithRatio.htm
rename to library/cropper/tests/example-CoordsOnLoadWithRatio.htm
diff --git a/cropper/tests/example-Dimensions.htm b/library/cropper/tests/example-Dimensions.htm
similarity index 100%
rename from cropper/tests/example-Dimensions.htm
rename to library/cropper/tests/example-Dimensions.htm
diff --git a/cropper/tests/example-DynamicImage.htm b/library/cropper/tests/example-DynamicImage.htm
similarity index 100%
rename from cropper/tests/example-DynamicImage.htm
rename to library/cropper/tests/example-DynamicImage.htm
diff --git a/cropper/tests/example-FixedRatio.htm b/library/cropper/tests/example-FixedRatio.htm
similarity index 100%
rename from cropper/tests/example-FixedRatio.htm
rename to library/cropper/tests/example-FixedRatio.htm
diff --git a/cropper/tests/example-MinimumDimensions.htm b/library/cropper/tests/example-MinimumDimensions.htm
similarity index 100%
rename from cropper/tests/example-MinimumDimensions.htm
rename to library/cropper/tests/example-MinimumDimensions.htm
diff --git a/cropper/tests/example-MinimumWidth.htm b/library/cropper/tests/example-MinimumWidth.htm
similarity index 100%
rename from cropper/tests/example-MinimumWidth.htm
rename to library/cropper/tests/example-MinimumWidth.htm
diff --git a/cropper/tests/example-Preview.htm b/library/cropper/tests/example-Preview.htm
similarity index 100%
rename from cropper/tests/example-Preview.htm
rename to library/cropper/tests/example-Preview.htm
diff --git a/cropper/tests/poppy.jpg b/library/cropper/tests/poppy.jpg
similarity index 100%
rename from cropper/tests/poppy.jpg
rename to library/cropper/tests/poppy.jpg
diff --git a/cropper/tests/staticHTMLStructure.htm b/library/cropper/tests/staticHTMLStructure.htm
similarity index 100%
rename from cropper/tests/staticHTMLStructure.htm
rename to library/cropper/tests/staticHTMLStructure.htm
diff --git a/phpsec/Crypt/AES.php b/library/phpsec/Crypt/AES.php
similarity index 100%
rename from phpsec/Crypt/AES.php
rename to library/phpsec/Crypt/AES.php
diff --git a/phpsec/Crypt/DES.php b/library/phpsec/Crypt/DES.php
similarity index 100%
rename from phpsec/Crypt/DES.php
rename to library/phpsec/Crypt/DES.php
diff --git a/phpsec/Crypt/Hash.php b/library/phpsec/Crypt/Hash.php
similarity index 100%
rename from phpsec/Crypt/Hash.php
rename to library/phpsec/Crypt/Hash.php
diff --git a/phpsec/Crypt/RC4.php b/library/phpsec/Crypt/RC4.php
similarity index 100%
rename from phpsec/Crypt/RC4.php
rename to library/phpsec/Crypt/RC4.php
diff --git a/phpsec/Crypt/RSA.php b/library/phpsec/Crypt/RSA.php
similarity index 100%
rename from phpsec/Crypt/RSA.php
rename to library/phpsec/Crypt/RSA.php
diff --git a/phpsec/Crypt/Random.php b/library/phpsec/Crypt/Random.php
similarity index 100%
rename from phpsec/Crypt/Random.php
rename to library/phpsec/Crypt/Random.php
diff --git a/phpsec/Crypt/Rijndael.php b/library/phpsec/Crypt/Rijndael.php
similarity index 100%
rename from phpsec/Crypt/Rijndael.php
rename to library/phpsec/Crypt/Rijndael.php
diff --git a/phpsec/Crypt/TripleDES.php b/library/phpsec/Crypt/TripleDES.php
similarity index 100%
rename from phpsec/Crypt/TripleDES.php
rename to library/phpsec/Crypt/TripleDES.php
diff --git a/phpsec/Math/BigInteger.php b/library/phpsec/Math/BigInteger.php
similarity index 100%
rename from phpsec/Math/BigInteger.php
rename to library/phpsec/Math/BigInteger.php
diff --git a/phpsec/Net/SFTP.php b/library/phpsec/Net/SFTP.php
similarity index 100%
rename from phpsec/Net/SFTP.php
rename to library/phpsec/Net/SFTP.php
diff --git a/phpsec/Net/SSH1.php b/library/phpsec/Net/SSH1.php
similarity index 100%
rename from phpsec/Net/SSH1.php
rename to library/phpsec/Net/SSH1.php
diff --git a/phpsec/Net/SSH2.php b/library/phpsec/Net/SSH2.php
similarity index 100%
rename from phpsec/Net/SSH2.php
rename to library/phpsec/Net/SSH2.php
diff --git a/phpsec/PHP/Compat/Function/array_fill.php b/library/phpsec/PHP/Compat/Function/array_fill.php
similarity index 100%
rename from phpsec/PHP/Compat/Function/array_fill.php
rename to library/phpsec/PHP/Compat/Function/array_fill.php
diff --git a/phpsec/PHP/Compat/Function/bcpowmod.php b/library/phpsec/PHP/Compat/Function/bcpowmod.php
similarity index 100%
rename from phpsec/PHP/Compat/Function/bcpowmod.php
rename to library/phpsec/PHP/Compat/Function/bcpowmod.php
diff --git a/phpsec/PHP/Compat/Function/str_split.php b/library/phpsec/PHP/Compat/Function/str_split.php
similarity index 100%
rename from phpsec/PHP/Compat/Function/str_split.php
rename to library/phpsec/PHP/Compat/Function/str_split.php
diff --git a/phpsec/crypt.html b/library/phpsec/crypt.html
similarity index 100%
rename from phpsec/crypt.html
rename to library/phpsec/crypt.html
diff --git a/phpsec/docbook.css b/library/phpsec/docbook.css
similarity index 100%
rename from phpsec/docbook.css
rename to library/phpsec/docbook.css
diff --git a/phpsec/index.html b/library/phpsec/index.html
similarity index 100%
rename from phpsec/index.html
rename to library/phpsec/index.html
diff --git a/phpsec/intro.html b/library/phpsec/intro.html
similarity index 100%
rename from phpsec/intro.html
rename to library/phpsec/intro.html
diff --git a/phpsec/math.html b/library/phpsec/math.html
similarity index 100%
rename from phpsec/math.html
rename to library/phpsec/math.html
diff --git a/phpsec/misc_crypt.html b/library/phpsec/misc_crypt.html
similarity index 100%
rename from phpsec/misc_crypt.html
rename to library/phpsec/misc_crypt.html
diff --git a/phpsec/net.html b/library/phpsec/net.html
similarity index 100%
rename from phpsec/net.html
rename to library/phpsec/net.html
diff --git a/phpsec/sym_crypt.html b/library/phpsec/sym_crypt.html
similarity index 100%
rename from phpsec/sym_crypt.html
rename to library/phpsec/sym_crypt.html
diff --git a/simplepie/LICENSE.txt b/library/simplepie/LICENSE.txt
similarity index 100%
rename from simplepie/LICENSE.txt
rename to library/simplepie/LICENSE.txt
diff --git a/simplepie/README.markdown b/library/simplepie/README.markdown
similarity index 100%
rename from simplepie/README.markdown
rename to library/simplepie/README.markdown
diff --git a/simplepie/compatibility_test/COMPATIBILITY README.txt b/library/simplepie/compatibility_test/COMPATIBILITY README.txt
similarity index 100%
rename from simplepie/compatibility_test/COMPATIBILITY README.txt
rename to library/simplepie/compatibility_test/COMPATIBILITY README.txt
diff --git a/simplepie/compatibility_test/sp_compatibility_test.php b/library/simplepie/compatibility_test/sp_compatibility_test.php
similarity index 100%
rename from simplepie/compatibility_test/sp_compatibility_test.php
rename to library/simplepie/compatibility_test/sp_compatibility_test.php
diff --git a/simplepie/create.php b/library/simplepie/create.php
similarity index 100%
rename from simplepie/create.php
rename to library/simplepie/create.php
diff --git a/simplepie/db.sql b/library/simplepie/db.sql
similarity index 100%
rename from simplepie/db.sql
rename to library/simplepie/db.sql
diff --git a/simplepie/demo/cli_test.php b/library/simplepie/demo/cli_test.php
similarity index 100%
rename from simplepie/demo/cli_test.php
rename to library/simplepie/demo/cli_test.php
diff --git a/simplepie/demo/for_the_demo/alternate_favicon.png b/library/simplepie/demo/for_the_demo/alternate_favicon.png
similarity index 100%
rename from simplepie/demo/for_the_demo/alternate_favicon.png
rename to library/simplepie/demo/for_the_demo/alternate_favicon.png
diff --git a/simplepie/demo/for_the_demo/background_blockquote.png b/library/simplepie/demo/for_the_demo/background_blockquote.png
similarity index 100%
rename from simplepie/demo/for_the_demo/background_blockquote.png
rename to library/simplepie/demo/for_the_demo/background_blockquote.png
diff --git a/simplepie/demo/for_the_demo/background_menuitem.gif b/library/simplepie/demo/for_the_demo/background_menuitem.gif
similarity index 100%
rename from simplepie/demo/for_the_demo/background_menuitem.gif
rename to library/simplepie/demo/for_the_demo/background_menuitem.gif
diff --git a/simplepie/demo/for_the_demo/background_menuitem_off.gif b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif
similarity index 100%
rename from simplepie/demo/for_the_demo/background_menuitem_off.gif
rename to library/simplepie/demo/for_the_demo/background_menuitem_off.gif
diff --git a/simplepie/demo/for_the_demo/background_menuitem_shadow.gif b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
similarity index 100%
rename from simplepie/demo/for_the_demo/background_menuitem_shadow.gif
rename to library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
diff --git a/simplepie/demo/for_the_demo/favicons/alternate.png b/library/simplepie/demo/for_the_demo/favicons/alternate.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/alternate.png
rename to library/simplepie/demo/for_the_demo/favicons/alternate.png
diff --git a/simplepie/demo/for_the_demo/favicons/blinklist.png b/library/simplepie/demo/for_the_demo/favicons/blinklist.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/blinklist.png
rename to library/simplepie/demo/for_the_demo/favicons/blinklist.png
diff --git a/simplepie/demo/for_the_demo/favicons/blogmarks.png b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/blogmarks.png
rename to library/simplepie/demo/for_the_demo/favicons/blogmarks.png
diff --git a/simplepie/demo/for_the_demo/favicons/delicious.png b/library/simplepie/demo/for_the_demo/favicons/delicious.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/delicious.png
rename to library/simplepie/demo/for_the_demo/favicons/delicious.png
diff --git a/simplepie/demo/for_the_demo/favicons/digg.png b/library/simplepie/demo/for_the_demo/favicons/digg.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/digg.png
rename to library/simplepie/demo/for_the_demo/favicons/digg.png
diff --git a/simplepie/demo/for_the_demo/favicons/magnolia.png b/library/simplepie/demo/for_the_demo/favicons/magnolia.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/magnolia.png
rename to library/simplepie/demo/for_the_demo/favicons/magnolia.png
diff --git a/simplepie/demo/for_the_demo/favicons/myweb2.png b/library/simplepie/demo/for_the_demo/favicons/myweb2.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/myweb2.png
rename to library/simplepie/demo/for_the_demo/favicons/myweb2.png
diff --git a/simplepie/demo/for_the_demo/favicons/newsvine.png b/library/simplepie/demo/for_the_demo/favicons/newsvine.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/newsvine.png
rename to library/simplepie/demo/for_the_demo/favicons/newsvine.png
diff --git a/simplepie/demo/for_the_demo/favicons/reddit.png b/library/simplepie/demo/for_the_demo/favicons/reddit.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/reddit.png
rename to library/simplepie/demo/for_the_demo/favicons/reddit.png
diff --git a/simplepie/demo/for_the_demo/favicons/segnalo.png b/library/simplepie/demo/for_the_demo/favicons/segnalo.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/segnalo.png
rename to library/simplepie/demo/for_the_demo/favicons/segnalo.png
diff --git a/simplepie/demo/for_the_demo/favicons/simpy.png b/library/simplepie/demo/for_the_demo/favicons/simpy.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/simpy.png
rename to library/simplepie/demo/for_the_demo/favicons/simpy.png
diff --git a/simplepie/demo/for_the_demo/favicons/spurl.png b/library/simplepie/demo/for_the_demo/favicons/spurl.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/spurl.png
rename to library/simplepie/demo/for_the_demo/favicons/spurl.png
diff --git a/simplepie/demo/for_the_demo/favicons/technorati.png b/library/simplepie/demo/for_the_demo/favicons/technorati.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/technorati.png
rename to library/simplepie/demo/for_the_demo/favicons/technorati.png
diff --git a/simplepie/demo/for_the_demo/favicons/wists.png b/library/simplepie/demo/for_the_demo/favicons/wists.png
similarity index 100%
rename from simplepie/demo/for_the_demo/favicons/wists.png
rename to library/simplepie/demo/for_the_demo/favicons/wists.png
diff --git a/simplepie/demo/for_the_demo/feed.png b/library/simplepie/demo/for_the_demo/feed.png
similarity index 100%
rename from simplepie/demo/for_the_demo/feed.png
rename to library/simplepie/demo/for_the_demo/feed.png
diff --git a/simplepie/demo/for_the_demo/logo_simplepie_demo.png b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
similarity index 100%
rename from simplepie/demo/for_the_demo/logo_simplepie_demo.png
rename to library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
diff --git a/simplepie/demo/for_the_demo/lucida-grande-bold.swf b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
similarity index 100%
rename from simplepie/demo/for_the_demo/lucida-grande-bold.swf
rename to library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
diff --git a/simplepie/demo/for_the_demo/mediaplayer.swf b/library/simplepie/demo/for_the_demo/mediaplayer.swf
similarity index 100%
rename from simplepie/demo/for_the_demo/mediaplayer.swf
rename to library/simplepie/demo/for_the_demo/mediaplayer.swf
diff --git a/simplepie/demo/for_the_demo/mediaplayer_readme.htm b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
similarity index 100%
rename from simplepie/demo/for_the_demo/mediaplayer_readme.htm
rename to library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
diff --git a/simplepie/demo/for_the_demo/mini_podcast.png b/library/simplepie/demo/for_the_demo/mini_podcast.png
similarity index 100%
rename from simplepie/demo/for_the_demo/mini_podcast.png
rename to library/simplepie/demo/for_the_demo/mini_podcast.png
diff --git a/simplepie/demo/for_the_demo/place_audio.png b/library/simplepie/demo/for_the_demo/place_audio.png
similarity index 100%
rename from simplepie/demo/for_the_demo/place_audio.png
rename to library/simplepie/demo/for_the_demo/place_audio.png
diff --git a/simplepie/demo/for_the_demo/place_video.png b/library/simplepie/demo/for_the_demo/place_video.png
similarity index 100%
rename from simplepie/demo/for_the_demo/place_video.png
rename to library/simplepie/demo/for_the_demo/place_video.png
diff --git a/simplepie/demo/for_the_demo/sIFR-print.css b/library/simplepie/demo/for_the_demo/sIFR-print.css
similarity index 100%
rename from simplepie/demo/for_the_demo/sIFR-print.css
rename to library/simplepie/demo/for_the_demo/sIFR-print.css
diff --git a/simplepie/demo/for_the_demo/sIFR-screen.css b/library/simplepie/demo/for_the_demo/sIFR-screen.css
similarity index 100%
rename from simplepie/demo/for_the_demo/sIFR-screen.css
rename to library/simplepie/demo/for_the_demo/sIFR-screen.css
diff --git a/simplepie/demo/for_the_demo/sifr-config.js b/library/simplepie/demo/for_the_demo/sifr-config.js
similarity index 100%
rename from simplepie/demo/for_the_demo/sifr-config.js
rename to library/simplepie/demo/for_the_demo/sifr-config.js
diff --git a/simplepie/demo/for_the_demo/sifr.js b/library/simplepie/demo/for_the_demo/sifr.js
similarity index 100%
rename from simplepie/demo/for_the_demo/sifr.js
rename to library/simplepie/demo/for_the_demo/sifr.js
diff --git a/simplepie/demo/for_the_demo/simplepie.css b/library/simplepie/demo/for_the_demo/simplepie.css
similarity index 100%
rename from simplepie/demo/for_the_demo/simplepie.css
rename to library/simplepie/demo/for_the_demo/simplepie.css
diff --git a/simplepie/demo/for_the_demo/sleight.js b/library/simplepie/demo/for_the_demo/sleight.js
similarity index 100%
rename from simplepie/demo/for_the_demo/sleight.js
rename to library/simplepie/demo/for_the_demo/sleight.js
diff --git a/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
similarity index 100%
rename from simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
rename to library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
diff --git a/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
similarity index 100%
rename from simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
rename to library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
diff --git a/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
similarity index 100%
rename from simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
rename to library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
diff --git a/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
similarity index 100%
rename from simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
rename to library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
diff --git a/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
similarity index 100%
rename from simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
rename to library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
diff --git a/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
similarity index 100%
rename from simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
rename to library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
diff --git a/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
similarity index 100%
rename from simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
rename to library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
diff --git a/simplepie/demo/for_the_demo/top_gradient.gif b/library/simplepie/demo/for_the_demo/top_gradient.gif
similarity index 100%
rename from simplepie/demo/for_the_demo/top_gradient.gif
rename to library/simplepie/demo/for_the_demo/top_gradient.gif
diff --git a/simplepie/demo/for_the_demo/verdana.swf b/library/simplepie/demo/for_the_demo/verdana.swf
similarity index 100%
rename from simplepie/demo/for_the_demo/verdana.swf
rename to library/simplepie/demo/for_the_demo/verdana.swf
diff --git a/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
similarity index 100%
rename from simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
rename to library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
diff --git a/simplepie/demo/handler_image.php b/library/simplepie/demo/handler_image.php
similarity index 100%
rename from simplepie/demo/handler_image.php
rename to library/simplepie/demo/handler_image.php
diff --git a/simplepie/demo/index.php b/library/simplepie/demo/index.php
similarity index 100%
rename from simplepie/demo/index.php
rename to library/simplepie/demo/index.php
diff --git a/simplepie/demo/minimalistic.php b/library/simplepie/demo/minimalistic.php
similarity index 100%
rename from simplepie/demo/minimalistic.php
rename to library/simplepie/demo/minimalistic.php
diff --git a/simplepie/demo/multifeeds.php b/library/simplepie/demo/multifeeds.php
similarity index 100%
rename from simplepie/demo/multifeeds.php
rename to library/simplepie/demo/multifeeds.php
diff --git a/simplepie/demo/test.php b/library/simplepie/demo/test.php
similarity index 100%
rename from simplepie/demo/test.php
rename to library/simplepie/demo/test.php
diff --git a/simplepie/idn/LICENCE b/library/simplepie/idn/LICENCE
similarity index 100%
rename from simplepie/idn/LICENCE
rename to library/simplepie/idn/LICENCE
diff --git a/simplepie/idn/ReadMe.txt b/library/simplepie/idn/ReadMe.txt
similarity index 100%
rename from simplepie/idn/ReadMe.txt
rename to library/simplepie/idn/ReadMe.txt
diff --git a/simplepie/idn/idna_convert.class.php b/library/simplepie/idn/idna_convert.class.php
similarity index 100%
rename from simplepie/idn/idna_convert.class.php
rename to library/simplepie/idn/idna_convert.class.php
diff --git a/simplepie/idn/npdata.ser b/library/simplepie/idn/npdata.ser
similarity index 100%
rename from simplepie/idn/npdata.ser
rename to library/simplepie/idn/npdata.ser
diff --git a/simplepie/simplepie.inc b/library/simplepie/simplepie.inc
similarity index 100%
rename from simplepie/simplepie.inc
rename to library/simplepie/simplepie.inc
diff --git a/tinymce/changelog.txt b/library/tinymce/changelog.txt
similarity index 100%
rename from tinymce/changelog.txt
rename to library/tinymce/changelog.txt
diff --git a/tinymce/examples/css/content.css b/library/tinymce/examples/css/content.css
similarity index 100%
rename from tinymce/examples/css/content.css
rename to library/tinymce/examples/css/content.css
diff --git a/tinymce/examples/css/word.css b/library/tinymce/examples/css/word.css
similarity index 100%
rename from tinymce/examples/css/word.css
rename to library/tinymce/examples/css/word.css
diff --git a/tinymce/examples/custom_formats.html b/library/tinymce/examples/custom_formats.html
similarity index 100%
rename from tinymce/examples/custom_formats.html
rename to library/tinymce/examples/custom_formats.html
diff --git a/tinymce/examples/full.html b/library/tinymce/examples/full.html
similarity index 100%
rename from tinymce/examples/full.html
rename to library/tinymce/examples/full.html
diff --git a/tinymce/examples/index.html b/library/tinymce/examples/index.html
similarity index 100%
rename from tinymce/examples/index.html
rename to library/tinymce/examples/index.html
diff --git a/tinymce/examples/lists/image_list.js b/library/tinymce/examples/lists/image_list.js
similarity index 100%
rename from tinymce/examples/lists/image_list.js
rename to library/tinymce/examples/lists/image_list.js
diff --git a/tinymce/examples/lists/link_list.js b/library/tinymce/examples/lists/link_list.js
similarity index 100%
rename from tinymce/examples/lists/link_list.js
rename to library/tinymce/examples/lists/link_list.js
diff --git a/tinymce/examples/lists/media_list.js b/library/tinymce/examples/lists/media_list.js
similarity index 100%
rename from tinymce/examples/lists/media_list.js
rename to library/tinymce/examples/lists/media_list.js
diff --git a/tinymce/examples/lists/template_list.js b/library/tinymce/examples/lists/template_list.js
similarity index 100%
rename from tinymce/examples/lists/template_list.js
rename to library/tinymce/examples/lists/template_list.js
diff --git a/tinymce/examples/media/logo.jpg b/library/tinymce/examples/media/logo.jpg
similarity index 100%
rename from tinymce/examples/media/logo.jpg
rename to library/tinymce/examples/media/logo.jpg
diff --git a/tinymce/examples/media/logo_over.jpg b/library/tinymce/examples/media/logo_over.jpg
similarity index 100%
rename from tinymce/examples/media/logo_over.jpg
rename to library/tinymce/examples/media/logo_over.jpg
diff --git a/tinymce/examples/media/sample.avi b/library/tinymce/examples/media/sample.avi
similarity index 100%
rename from tinymce/examples/media/sample.avi
rename to library/tinymce/examples/media/sample.avi
diff --git a/tinymce/examples/media/sample.dcr b/library/tinymce/examples/media/sample.dcr
similarity index 100%
rename from tinymce/examples/media/sample.dcr
rename to library/tinymce/examples/media/sample.dcr
diff --git a/tinymce/examples/media/sample.mov b/library/tinymce/examples/media/sample.mov
similarity index 100%
rename from tinymce/examples/media/sample.mov
rename to library/tinymce/examples/media/sample.mov
diff --git a/tinymce/examples/media/sample.ram b/library/tinymce/examples/media/sample.ram
similarity index 100%
rename from tinymce/examples/media/sample.ram
rename to library/tinymce/examples/media/sample.ram
diff --git a/tinymce/examples/media/sample.rm b/library/tinymce/examples/media/sample.rm
similarity index 100%
rename from tinymce/examples/media/sample.rm
rename to library/tinymce/examples/media/sample.rm
diff --git a/tinymce/examples/media/sample.swf b/library/tinymce/examples/media/sample.swf
similarity index 100%
rename from tinymce/examples/media/sample.swf
rename to library/tinymce/examples/media/sample.swf
diff --git a/tinymce/examples/menu.html b/library/tinymce/examples/menu.html
similarity index 100%
rename from tinymce/examples/menu.html
rename to library/tinymce/examples/menu.html
diff --git a/tinymce/examples/simple.html b/library/tinymce/examples/simple.html
similarity index 100%
rename from tinymce/examples/simple.html
rename to library/tinymce/examples/simple.html
diff --git a/tinymce/examples/skins.html b/library/tinymce/examples/skins.html
similarity index 100%
rename from tinymce/examples/skins.html
rename to library/tinymce/examples/skins.html
diff --git a/tinymce/examples/templates/layout1.htm b/library/tinymce/examples/templates/layout1.htm
similarity index 100%
rename from tinymce/examples/templates/layout1.htm
rename to library/tinymce/examples/templates/layout1.htm
diff --git a/tinymce/examples/templates/snippet1.htm b/library/tinymce/examples/templates/snippet1.htm
similarity index 100%
rename from tinymce/examples/templates/snippet1.htm
rename to library/tinymce/examples/templates/snippet1.htm
diff --git a/tinymce/examples/translate.html b/library/tinymce/examples/translate.html
similarity index 100%
rename from tinymce/examples/translate.html
rename to library/tinymce/examples/translate.html
diff --git a/tinymce/examples/word.html b/library/tinymce/examples/word.html
similarity index 100%
rename from tinymce/examples/word.html
rename to library/tinymce/examples/word.html
diff --git a/tinymce/jscripts/tiny_mce/langs/en.js b/library/tinymce/jscripts/tiny_mce/langs/en.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/langs/en.js
rename to library/tinymce/jscripts/tiny_mce/langs/en.js
diff --git a/tinymce/jscripts/tiny_mce/license.txt b/library/tinymce/jscripts/tiny_mce/license.txt
similarity index 100%
rename from tinymce/jscripts/tiny_mce/license.txt
rename to library/tinymce/jscripts/tiny_mce/license.txt
diff --git a/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css b/library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
rename to library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm b/library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css b/library/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
rename to library/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm b/library/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif b/library/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css b/library/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
rename to library/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm b/library/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js b/library/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js
rename to library/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm b/library/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif b/library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm b/library/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif b/library/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js b/library/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
rename to library/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js b/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
rename to library/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
rename to library/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
rename to library/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/css/content.css b/library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/css/content.css
rename to library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/css/media.css b/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/css/media.css
rename to library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf b/library/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
rename to library/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif b/library/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js b/library/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
rename to library/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/js/media.js
rename to library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/media/media.htm b/library/tinymce/jscripts/tiny_mce/plugins/media/media.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/media/media.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/media/media.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
rename to library/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif b/library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
rename to library/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
rename to library/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm b/library/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm b/library/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/preview/example.html b/library/tinymce/jscripts/tiny_mce/plugins/preview/example.html
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/preview/example.html
rename to library/tinymce/jscripts/tiny_mce/plugins/preview/example.html
diff --git a/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js b/library/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
rename to library/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/preview/preview.html b/library/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/preview/preview.html
rename to library/tinymce/jscripts/tiny_mce/plugins/preview/preview.html
diff --git a/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
rename to library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
rename to library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
rename to library/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif b/library/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
rename to library/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif
diff --git a/tinymce/jscripts/tiny_mce/plugins/style/css/props.css b/library/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/style/css/props.css
rename to library/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/style/js/props.js b/library/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/style/js/props.js
rename to library/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/style/props.htm b/library/tinymce/jscripts/tiny_mce/plugins/style/props.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/style/props.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/style/props.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/cell.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/cell.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css b/library/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
rename to library/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/css/row.css b/library/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/css/row.css
rename to library/tinymce/jscripts/tiny_mce/plugins/table/css/row.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/css/table.css b/library/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/css/table.css
rename to library/tinymce/jscripts/tiny_mce/plugins/table/css/table.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
rename to library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
rename to library/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/js/row.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/js/row.js
rename to library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/js/table.js
rename to library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/row.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/row.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/table/row.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/table/table.htm b/library/tinymce/jscripts/tiny_mce/plugins/table/table.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/table/table.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/table/table.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/template/blank.htm b/library/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/template/blank.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/template/blank.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/template/css/template.css b/library/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/template/css/template.css
rename to library/tinymce/jscripts/tiny_mce/plugins/template/css/template.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/template/js/template.js b/library/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/template/js/template.js
rename to library/tinymce/jscripts/tiny_mce/plugins/template/js/template.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/template/template.htm b/library/tinymce/jscripts/tiny_mce/plugins/template/template.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/template/template.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/template/template.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js
diff --git a/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/about.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/about.htm
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/about.htm
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/image.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/image.htm
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/image.htm
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/link.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/link.htm
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/link.htm
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm b/library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
rename to library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
rename to library/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js b/library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
rename to library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif b/library/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
rename to library/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js b/library/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
rename to library/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
rename to library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
rename to library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
rename to library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
rename to library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png
diff --git a/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css b/library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
similarity index 100%
rename from tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
rename to library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css
diff --git a/tinymce/jscripts/tiny_mce/tiny_mce.js b/library/tinymce/jscripts/tiny_mce/tiny_mce.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/tiny_mce.js
rename to library/tinymce/jscripts/tiny_mce/tiny_mce.js
diff --git a/tinymce/jscripts/tiny_mce/tiny_mce_popup.js b/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/tiny_mce_popup.js
rename to library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
diff --git a/tinymce/jscripts/tiny_mce/tiny_mce_src.js b/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/tiny_mce_src.js
rename to library/tinymce/jscripts/tiny_mce/tiny_mce_src.js
diff --git a/tinymce/jscripts/tiny_mce/utils/editable_selects.js b/library/tinymce/jscripts/tiny_mce/utils/editable_selects.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/utils/editable_selects.js
rename to library/tinymce/jscripts/tiny_mce/utils/editable_selects.js
diff --git a/tinymce/jscripts/tiny_mce/utils/form_utils.js b/library/tinymce/jscripts/tiny_mce/utils/form_utils.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/utils/form_utils.js
rename to library/tinymce/jscripts/tiny_mce/utils/form_utils.js
diff --git a/tinymce/jscripts/tiny_mce/utils/mctabs.js b/library/tinymce/jscripts/tiny_mce/utils/mctabs.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/utils/mctabs.js
rename to library/tinymce/jscripts/tiny_mce/utils/mctabs.js
diff --git a/tinymce/jscripts/tiny_mce/utils/validate.js b/library/tinymce/jscripts/tiny_mce/utils/validate.js
similarity index 100%
rename from tinymce/jscripts/tiny_mce/utils/validate.js
rename to library/tinymce/jscripts/tiny_mce/utils/validate.js
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 31314da7b2..64b5ec479e 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('simplepie/simplepie.inc');
+require_once('library/simplepie/simplepie.inc');
 require_once('include/items.php');
 require_once('include/event.php');
 
diff --git a/mod/salmon.php b/mod/salmon.php
index c2f76aa0a6..3ace417cd8 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,14 +1,11 @@
 <?php
 
 
-// TODO: 
-// add relevant contacts so they can use this
-
 // There is a lot of debug stuff in here because this is quite a
 // complicated process to try and sort out. 
 
 require_once('include/salmon.php');
-require_once('simplepie/simplepie.inc');
+require_once('library/simplepie/simplepie.inc');
 
 function salmon_return($val) {
 
@@ -133,9 +130,9 @@ function salmon_post(&$a) {
 
 	// Setup RSA stuff to verify the signature
 
-	set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
+	set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
 
-	require_once('phpsec/Crypt/RSA.php');
+	require_once('library/phpsec/Crypt/RSA.php');
 
 	$key_info = explode('.',$key);
 
diff --git a/view/contact_head.tpl b/view/contact_head.tpl
index 6a80c21222..c7de390af2 100644
--- a/view/contact_head.tpl
+++ b/view/contact_head.tpl
@@ -1,5 +1,5 @@
 <script language="javascript" type="text/javascript"
-          src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
 
 
diff --git a/view/crophead.tpl b/view/crophead.tpl
index 2bfb7abe02..48f3754265 100644
--- a/view/crophead.tpl
+++ b/view/crophead.tpl
@@ -1,6 +1,4 @@
-      <script type="text/javascript" src="cropper/lib/prototype.js" language="javascript"></script>
-
-      <script type="text/javascript" src="cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-
-      <script type="text/javascript" src="cropper/cropper.js" language="javascript"></script>
-      <link rel="stylesheet" href="cropper/cropper.css" type="text/css" />
+      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/event_head.tpl b/view/event_head.tpl
index 4e50631316..fe0b8fe2a0 100644
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
@@ -1,5 +1,5 @@
 <script language="javascript" type="text/javascript"
-          src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
 
 
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index bf2dde8e9b..d7a4295125 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -1,5 +1,5 @@
 
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 var editor;
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index 77e58bc098..67775a45b2 100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -1,5 +1,5 @@
 
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 tinyMCE.init({
diff --git a/view/profed_head.tpl b/view/profed_head.tpl
index 1c1efdbe5e..e1df2c4ad7 100644
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -1,5 +1,5 @@
 <script language="javascript" type="text/javascript"
-          src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
 
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 6e771634a9..0c4b710c0b 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1003,8 +1003,12 @@ input#dfrn-url {
 .wall-item-like-buttons {
 	float: left;
 	margin-right: 10px;
-	padding-right: 10px;
-	border-right: 2px solid #fff;
+/*	padding-right: 10px; */
+/*	border-right: 2px solid #fff; */
+}
+
+.like-rotator {
+	margin-left: 5px;
 }
 
 .wall-item-like-buttons > a,
@@ -1018,6 +1022,7 @@ input#dfrn-url {
 
 .wall-item-share-buttons {
 	margin-left: 10px;
+	margin-right: 10px;
 }
 
 .editpost {