diff --git a/app/code/local/Aoe/DesignFallback/Helper/Data.php b/app/code/local/Aoe/DesignFallback/Helper/Data.php
deleted file mode 100644
index 8955c00..0000000
--- a/app/code/local/Aoe/DesignFallback/Helper/Data.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class Aoe_DesignFallback_Helper_Data extends Mage_Core_Helper_Abstract {
-
-}
diff --git a/app/code/local/Aoe/DesignFallback/Model/Design/Package.php b/app/code/local/Aoe/DesignFallback/Model/Design/Package.php
deleted file mode 100644
index 7d5eaa8..0000000
--- a/app/code/local/Aoe/DesignFallback/Model/Design/Package.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-class Aoe_DesignFallback_Model_Design_Package extends Mage_Core_Model_Design_Package {
-
-
-	/**
-	 * Check for files existence by specified scheme
-	 *
-	 * @param string $file
-	 * @param array &$params
-	 * @param array $fallbackScheme
-	 * @return string
-	 */
-	protected function _fallback($file, array &$params, array $fallbackScheme = array(array())) {
-		return parent::_fallback($file, $params, $this->getFallbackScheme($params));
-	}
-
-	/**
-	 * Get fallback scheme from configuration
-	 *
-	 * @param array $defaults (optional). Needed for resolving default package and theme for duplicates eliminiation
-	 * @return array
-	 */
-	protected function getFallbackScheme(array $defaults=array()) {
-		$configuration = Mage::getStoreConfig('design/fallback/fallback', $this->getStore());
-		$fallbackScheme = array();
-		foreach (explode("\n", $configuration) as $line) {
-			if (strpos($line, ':') === false) {
-				Mage::throwException('Line must contain package and theme separated by ":"');
-			}
-			list($packageName, $themeName) = explode(':', $line);
-
-			$packageName = $this->resolveConfiguration($packageName);
-			if (!empty($packageName)) { // empty values will be evaluated to current package ...
-				if (!$this->designPackageExists($packageName, $this->getArea())) {
-					// Mage::log(sprintf('Could not find package "%s". Using "%s" instead.', $packageName, Mage_Core_Model_Design_Package::DEFAULT_PACKAGE));
-					$packageName = Mage_Core_Model_Design_Package::DEFAULT_PACKAGE;
-				}
-			} else {
-				$packageName = $defaults['_package'];
-			}
-
-			$themeName = $this->resolveConfiguration($themeName);
-			if (empty($themeName)) {
-				$themeName = $defaults['_theme'];
-			}
-
-			$params = array(
-				'_package' => $packageName,
-				'_theme' => $themeName,
-			);
-
-			// avoid exact duplicates that are neighbours
-			if ($params !== end($fallbackScheme)) {
-				$fallbackScheme[] = $params;
-			}
-		}
-
-		/*
-		$debug = array();
-		foreach ($fallbackScheme as $level) { $debug[] = implode('/', $level); }
-		Mage::log($debug);
-		*/
-
-		return $fallbackScheme;
-	}
-
-	/**
-	 * Resolve configuration.
-	 * Values wrapped in {...} will be looked up in configuration.
-	 * Example: {design/package/name}
-	 *
-	 * @param $value
-	 * @return string
-	 */
-	protected function resolveConfiguration($value) {
-		$value = trim($value);
-		if (strtolower($value == '[current]')) {
-			// empty value will be in ->updateParamDefaults().
-			// to the current package and theme taking type-specific themes and design changed (System -> Design) into account
-			$value = NULL;
-		} elseif ($value[0] == '{' && $value[strlen($value)-1] == '}') {
-			$value = substr($value, 1, -1);
-			$value = Mage::getStoreConfig($value, $this->getStore());
-		}
-		return $value;
-	}
-
-}
diff --git a/app/code/local/Aoe/DesignFallback/etc/config.xml b/app/code/local/Aoe/DesignFallback/etc/config.xml
deleted file mode 100644
index 7354da2..0000000
--- a/app/code/local/Aoe/DesignFallback/etc/config.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-	<modules>
-		<Aoe_DesignFallback>
-			<version>0.2.1</version>
-		</Aoe_DesignFallback>
-	</modules>
-
-	<global>
-		<helpers>
-			<aoe_designfallback>
-				<class>Aoe_DesignFallback_Helper</class>
-			</aoe_designfallback>
-		</helpers>
-		<models>
-			<aoe_designfallback>
-				<class>Aoe_DesignFallback_Model</class>
-			</aoe_designfallback>
-			<core>
-				<rewrite>
-					<design_package>Aoe_DesignFallback_Model_Design_Package</design_package>
-				</rewrite>
-			</core>
-		</models>
-	</global>
-
-	<frontend>
-		<layout>
-			<updates>
-				<aoe_designfallback module="Aoe_DesignFallback">
-					<file>aoe_designfallback/aoe_designfallback.xml</file>
-				</aoe_designfallback>
-			</updates>
-		</layout>
-	</frontend>
-
-	<default>
-		<design>
-			<fallback>
-				<fallback><![CDATA[[current]:[current]
-[current]:default
-base:default]]></fallback>
-			</fallback>
-		</design>
-	</default>
-
-</config>
diff --git a/app/code/local/Aoe/DesignFallback/etc/system.xml b/app/code/local/Aoe/DesignFallback/etc/system.xml
deleted file mode 100644
index 74232e6..0000000
--- a/app/code/local/Aoe/DesignFallback/etc/system.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<config>
-    <sections>
-        <design>
-            <groups>
-                <fallback translate="label">
-                    <label>Fallback</label>
-                    <frontend_type>text</frontend_type>
-                    <sort_order>0</sort_order>
-                    <show_in_default>1</show_in_default>
-                    <show_in_website>1</show_in_website>
-                    <show_in_store>1</show_in_store>
-                    <fields>
-                        <fallback translate="label">
-                            <label>Fallback configuration</label>
-                            <frontend_type>textarea</frontend_type>
-                            <sort_order>1</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>1</show_in_store>
-							<comment><![CDATA[
-<b>Instructions:</b><br />
-Insert one line per fallback level.<br />
-Separate package name from theme name by a ":".<br />
-Use <b>{path/to/configuration}</b> for variables that will be replaced by their configured value.<br />
-Use <b>[current]</b> for using the package or theme that is currently set. In contrast to using {design/package/name} and {design/theme/default} this takes type-specific themes and design changes (System &gt; Design) into account.<br />
-First line has highest priority.<br /><br />
-<b>Magento's default behaviour is reflected by:</b><br />
-[current]:[current]<br />
-[current]:default<br />
-base:default]]></comment>
-                        </fallback>
-                    </fields>
-                </fallback>
-            </groups>
-        </design>
-	</sections>
-</config>
diff --git a/app/etc/modules/Aoe_DesignFallback.xml b/app/etc/modules/Aoe_DesignFallback.xml
deleted file mode 100644
index 5948670..0000000
--- a/app/etc/modules/Aoe_DesignFallback.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-	<modules>
-		<Aoe_DesignFallback>
-			<codePool>local</codePool>
-			<active>true</active>
-		</Aoe_DesignFallback>
-	</modules>
-</config>
diff --git a/modman b/modman
index d2cd560..a2d3b14 100644
--- a/modman
+++ b/modman
@@ -1,2 +1,2 @@
 app/etc/modules/*							app/etc/modules/
-app/code/local/Aoe/DesignFallback		app/code/local/Aoe/DesignFallback
+app/code/community/Aoe/DesignFallback		app/code/community/Aoe/DesignFallback