diff --git a/liberator/Makefile.common b/common/Makefile.common
similarity index 100%
rename from liberator/Makefile.common
rename to common/Makefile.common
diff --git a/liberator/content/README.E4X b/common/content/README.E4X
similarity index 100%
rename from liberator/content/README.E4X
rename to common/content/README.E4X
diff --git a/liberator/content/bindings.xml b/common/content/bindings.xml
similarity index 100%
rename from liberator/content/bindings.xml
rename to common/content/bindings.xml
diff --git a/liberator/content/buffer.js b/common/content/buffer.js
similarity index 100%
rename from liberator/content/buffer.js
rename to common/content/buffer.js
diff --git a/liberator/content/buffer.xhtml b/common/content/buffer.xhtml
similarity index 100%
rename from liberator/content/buffer.xhtml
rename to common/content/buffer.xhtml
diff --git a/liberator/content/commands.js b/common/content/commands.js
similarity index 100%
rename from liberator/content/commands.js
rename to common/content/commands.js
diff --git a/liberator/content/completion.js b/common/content/completion.js
similarity index 100%
rename from liberator/content/completion.js
rename to common/content/completion.js
diff --git a/liberator/content/editor.js b/common/content/editor.js
similarity index 100%
rename from liberator/content/editor.js
rename to common/content/editor.js
diff --git a/liberator/content/eval.js b/common/content/eval.js
similarity index 100%
rename from liberator/content/eval.js
rename to common/content/eval.js
diff --git a/liberator/content/events.js b/common/content/events.js
similarity index 100%
rename from liberator/content/events.js
rename to common/content/events.js
diff --git a/liberator/content/find.js b/common/content/find.js
similarity index 100%
rename from liberator/content/find.js
rename to common/content/find.js
diff --git a/liberator/content/help.css b/common/content/help.css
similarity index 100%
rename from liberator/content/help.css
rename to common/content/help.css
diff --git a/liberator/content/hints.js b/common/content/hints.js
similarity index 100%
rename from liberator/content/hints.js
rename to common/content/hints.js
diff --git a/liberator/content/io.js b/common/content/io.js
similarity index 100%
rename from liberator/content/io.js
rename to common/content/io.js
diff --git a/liberator/content/liberator-overlay.js b/common/content/liberator-overlay.js
similarity index 100%
rename from liberator/content/liberator-overlay.js
rename to common/content/liberator-overlay.js
diff --git a/liberator/content/liberator.js b/common/content/liberator.js
similarity index 100%
rename from liberator/content/liberator.js
rename to common/content/liberator.js
diff --git a/liberator/content/liberator.xul b/common/content/liberator.xul
similarity index 100%
rename from liberator/content/liberator.xul
rename to common/content/liberator.xul
diff --git a/liberator/content/mappings.js b/common/content/mappings.js
similarity index 100%
rename from liberator/content/mappings.js
rename to common/content/mappings.js
diff --git a/liberator/content/modes.js b/common/content/modes.js
similarity index 100%
rename from liberator/content/modes.js
rename to common/content/modes.js
diff --git a/liberator/content/options.js b/common/content/options.js
similarity index 100%
rename from liberator/content/options.js
rename to common/content/options.js
diff --git a/liberator/content/style.js b/common/content/style.js
similarity index 100%
rename from liberator/content/style.js
rename to common/content/style.js
diff --git a/liberator/content/tabs.js b/common/content/tabs.js
similarity index 100%
rename from liberator/content/tabs.js
rename to common/content/tabs.js
diff --git a/liberator/content/template.js b/common/content/template.js
similarity index 100%
rename from liberator/content/template.js
rename to common/content/template.js
diff --git a/liberator/content/ui.js b/common/content/ui.js
similarity index 100%
rename from liberator/content/ui.js
rename to common/content/ui.js
diff --git a/liberator/content/util.js b/common/content/util.js
similarity index 100%
rename from liberator/content/util.js
rename to common/content/util.js
diff --git a/liberator/make_jar.sh b/common/make_jar.sh
similarity index 100%
rename from liberator/make_jar.sh
rename to common/make_jar.sh
diff --git a/liberator/modules/storage.jsm b/common/modules/storage.jsm
similarity index 100%
rename from liberator/modules/storage.jsm
rename to common/modules/storage.jsm
diff --git a/liberator/process_manifest.awk b/common/process_manifest.awk
similarity index 100%
rename from liberator/process_manifest.awk
rename to common/process_manifest.awk
diff --git a/liberator/skin/icon.png b/common/skin/icon.png
similarity index 100%
rename from liberator/skin/icon.png
rename to common/skin/icon.png
diff --git a/liberator/skin/liberator.css b/common/skin/liberator.css
similarity index 100%
rename from liberator/skin/liberator.css
rename to common/skin/liberator.css