diff --git a/prebuild.xml b/prebuild.xml
index cc7d0be..c6892aa 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.10.xsd" version="1.10">
+
 	<Solution name="Prebuild" version="2.0.9" frameworkVersion="net7_0">
 		<Options>
 			<UseDepsFile>true</UseDepsFile>
@@ -25,93 +26,8 @@
 		<Files>
 			<File>prebuild.xml</File>
 		</Files>
-		<Project name="Prebuild"
-		         path="source/Prebuild"
-		         language="C#"
-		         assemblyName="prebuild"
-		         icon="App.ico"
-		         type="Exe"
-		         rootNamespace="Prebuild"
-		         startupObject="Prebuild.Prebuild"
-		         version="2.0.9"
-		>
-			<Author>Matthew Holmes (matthew@wildfiregames.com)</Author>
-			<Author>Dan Moorehead (dan05a@gmail.com)</Author>
-			<Author>Dave Hudson (jendave@yahoo.com)</Author>
-			<Author>Rob Loach (http://robloach.net)</Author>
-			<Author>C.J. Adams-Collier (cjac@colliertech.org)</Author>
-			<Author>John Hurliman (john.hurliman@intel.com)</Author>
-			<Author>WhiteCore build (2015) Rowan Deppeler (greythan@gmail.com)</Author>
-			<Author>OpenSimulator build (2017) AJLDuarte</Author>
-			<Description>The Prebuild project generator</Description>
-			<Configuration name="Debug">
-				<Options>
-					<CompilerDefines>DEBUG;TRACE</CompilerDefines>
-					<OptimizeCode>false</OptimizeCode>
-					<OutputPath>../../bootstrap/debug</OutputPath>
-					<DebugInformation>true</DebugInformation>
-					<KeyFile>Prebuild.snk</KeyFile>
-					<SuppressWarnings>1595</SuppressWarnings>
 
-          <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-          <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-				</Options>
-			</Configuration>
-			<Configuration name="Release">
-				<Options>
-					<CompilerDefines>TRACE</CompilerDefines>
-					<OutputPath>../../bootstrap/</OutputPath>
-					<OptimizeCode>true</OptimizeCode>
-					<DebugInformation>false</DebugInformation>
-					<KeyFile>Prebuild.snk</KeyFile>
-					<SuppressWarnings>1595</SuppressWarnings>
-          <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-          <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-				</Options>
-			</Configuration>
-			<Reference name="System.EnterpriseServices" />
-			<Files>
-				<Match pattern="App.ico" buildAction="EmbeddedResource"/>
-				<Match path="data" pattern="prebuild-1.10.xsd" buildAction="EmbeddedResource"/>
-				<Match path="data" pattern="autotools.xml" buildAction="EmbeddedResource"/>
-				<Match pattern="*.cs" recurse="true">
-					<Exclude name="obj" pattern="obj"/>
-				</Match>
-			</Files>
-		</Project>
-  
-		<Project name="SnapWrap"
-             path="source/SnapWrap"
-             language="C#"
-             type="Exe"
-             version="1.0.1"
-             rootNamespace="dev.zontreck.snap"
-             startupObject="dev.zontreck.snap.Wrap">
-      <Author>Tara Piccari (tarapiccari@gmail.com)</Author>
-      <Description>C# Prebuild Scripting for code generation</Description>
-			<Configuration name="Debug">
-        <Options>
-          <OutputPath>../../bootstrap/debug/</OutputPath>
-          <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-          <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		  
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../bootstrap/</OutputPath>
-          <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-          <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-        </Options>
-      </Configuration>
+		<?include file="source/*/prebuild*.xml"?>
 
-
-      <PackageReference name="Microsoft.CodeAnalysis" version="4.6.0"/>
-      <PackageReference name="Microsoft.CodeAnalysis.CSharp" version="4.6.0"/>
-      <PackageReference name="Microsoft.CodeAnalysis.CSharp.Scripting" version="4.6.0"/>
-	  <Reference name="System.Diagnostics"/>
-	  <Reference name="System.Diagnostics.Process"/>
-
-		</Project>
 	</Solution>
-</Prebuild>
+</Prebuild>
\ No newline at end of file
diff --git a/source/Prebuild/prebuild.xml b/source/Prebuild/prebuild.xml
new file mode 100644
index 0000000..3b6a29f
--- /dev/null
+++ b/source/Prebuild/prebuild.xml
@@ -0,0 +1,54 @@
+<Project name="Prebuild"
+    path="source/Prebuild"
+    language="C#"
+    assemblyName="prebuild"
+    icon="App.ico"
+    type="Exe"
+    rootNamespace="Prebuild"
+    startupObject="Prebuild.Prebuild"
+    version="2.0.9"
+>
+    <Author>Matthew Holmes (matthew@wildfiregames.com)</Author>
+    <Author>Dan Moorehead (dan05a@gmail.com)</Author>
+    <Author>Dave Hudson (jendave@yahoo.com)</Author>
+    <Author>Rob Loach (http://robloach.net)</Author>
+    <Author>C.J. Adams-Collier (cjac@colliertech.org)</Author>
+    <Author>John Hurliman (john.hurliman@intel.com)</Author>
+    <Author>WhiteCore build (2015) Rowan Deppeler (greythan@gmail.com)</Author>
+    <Author>OpenSimulator build (2017) AJLDuarte</Author>
+    <Description>The Prebuild project generator</Description>
+    <Configuration name="Debug">
+        <Options>
+            <CompilerDefines>DEBUG;TRACE</CompilerDefines>
+            <OptimizeCode>false</OptimizeCode>
+            <OutputPath>../../bootstrap/debug</OutputPath>
+            <DebugInformation>true</DebugInformation>
+            <KeyFile>Prebuild.snk</KeyFile>
+            <SuppressWarnings>1595</SuppressWarnings>
+
+            <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+            <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+        </Options>
+    </Configuration>
+    <Configuration name="Release">
+        <Options>
+            <CompilerDefines>TRACE</CompilerDefines>
+            <OutputPath>../../bootstrap/</OutputPath>
+            <OptimizeCode>true</OptimizeCode>
+            <DebugInformation>false</DebugInformation>
+            <KeyFile>Prebuild.snk</KeyFile>
+            <SuppressWarnings>1595</SuppressWarnings>
+            <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+            <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+        </Options>
+    </Configuration>
+    <Reference name="System.EnterpriseServices" />
+    <Files>
+        <Match pattern="App.ico" buildAction="EmbeddedResource" />
+        <Match path="data" pattern="prebuild-1.10.xsd" buildAction="EmbeddedResource" />
+        <Match path="data" pattern="autotools.xml" buildAction="EmbeddedResource" />
+        <Match pattern="*.cs" recurse="true">
+            <Exclude name="obj" pattern="obj" />
+        </Match>
+    </Files>
+</Project>
\ No newline at end of file
diff --git a/source/SnapWrap/prebuild.xml b/source/SnapWrap/prebuild.xml
new file mode 100644
index 0000000..33a0d62
--- /dev/null
+++ b/source/SnapWrap/prebuild.xml
@@ -0,0 +1,33 @@
+<Project name="SnapWrap"
+    path="source/SnapWrap"
+    language="C#"
+    type="Exe"
+    version="1.0.1"
+    rootNamespace="dev.zontreck.snap"
+    startupObject="dev.zontreck.snap.Wrap">
+    <Author>Tara Piccari (tarapiccari@gmail.com)</Author>
+    <Description>C# Prebuild Scripting for code generation</Description>
+    <Configuration name="Debug">
+        <Options>
+            <OutputPath>../../bootstrap/debug/</OutputPath>
+            <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+            <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+
+        </Options>
+    </Configuration>
+    <Configuration name="Release">
+        <Options>
+            <OutputPath>../../bootstrap/</OutputPath>
+            <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+            <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+        </Options>
+    </Configuration>
+
+
+    <PackageReference name="Microsoft.CodeAnalysis" version="4.6.0" />
+    <PackageReference name="Microsoft.CodeAnalysis.CSharp" version="4.6.0" />
+    <PackageReference name="Microsoft.CodeAnalysis.CSharp.Scripting" version="4.6.0" />
+    <Reference name="System.Diagnostics" />
+    <Reference name="System.Diagnostics.Process" />
+
+</Project>
\ No newline at end of file