diff --git a/OpenSim/Region/ReplaceableModules/MoneyModule/Resources/MoneyModulePlugin.addin.xml b/OpenSim/Region/ReplaceableModules/MoneyModule/Resources/MoneyModulePlugin.addin.xml
new file mode 100644
index 0000000000..a25f2979da
--- /dev/null
+++ b/OpenSim/Region/ReplaceableModules/MoneyModule/Resources/MoneyModulePlugin.addin.xml
@@ -0,0 +1,8 @@
+<Addin id="OpenSim.Region.ReplaceableModules.MoneyModule" version="0.2">
+    <Runtime>
+        <Import assembly="OpenSim.Region.ReplaceableModules.MoneyModule.dll"/>
+    </Runtime>
+    <Dependencies>
+        <Addin id="OpenSim" version="0.5" />
+    </Dependencies>
+</Addin>
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
similarity index 99%
rename from OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
rename to OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
index ea4a785f13..7d7910219e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
@@ -42,7 +42,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
+namespace OpenSim.Region.ReplaceableModules.MoneyModule
 {
     /// <summary>
     /// Demo Economy/Money Module.  This is not a production quality money/economy module!
diff --git a/OpenSim/Region/ReplaceableModules/README.txt b/OpenSim/Region/ReplaceableModules/README.txt
new file mode 100644
index 0000000000..e8e759b548
--- /dev/null
+++ b/OpenSim/Region/ReplaceableModules/README.txt
@@ -0,0 +1,5 @@
+This folder is for modules that we intend to let users and system admins replace.
+
+This folder should never end up a project.  Only subfolders should end up as a project.   The idea here is that each folder 
+will produce a project and a separate .dll assembly for the module that will get picked up by the module loader.  
+To replace the functionality, you simply replace the .dll with a different one.
\ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index b451fece39..85f270282f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2964,6 +2964,45 @@
         </Match>
       </Files>
     </Project>
+
+    <Project name="OpenSim.Region.ReplaceableModules.MoneyModule" path="OpenSim/Region/ReplaceableModules/MoneyModule" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Web"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.Framework" />
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Framework.Serialization"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="XMLRPC.dll"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>  
+
+      <Files>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
+        <Match pattern="*.cs" recurse="true">
+        </Match>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
+      </Files>
+    </Project>
+
     <Project name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
       <Configuration name="Debug">
         <Options>