diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2f7896d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/EmptyUMap b/assets/EmptyUMap
similarity index 100%
rename from EmptyUMap
rename to assets/EmptyUMap
diff --git a/XCOM2.targets b/assets/XCOM2.targets
similarity index 82%
rename from XCOM2.targets
rename to assets/XCOM2.targets
index 5c3f0bd..9eff353 100644
--- a/XCOM2.targets
+++ b/assets/XCOM2.targets
@@ -76,17 +76,5 @@
     </Target>
 
     <!-- Task definition -->
-    <UsingTask TaskName="InvokePowershellTask" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <EntryPs1 Required="true" />
-            <SolutionRoot Required="true" />
-            <SdkInstallPath Required="true" />
-            <GameInstallPath Required="true" />
-            <AdditionalArgs ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="false" />
-          </ParameterGroup>
-        <Task>
-            <Reference Include="System.Management.Automation" />
-            <Code Language="cs" Source="$(BuildCommonRoot)InvokePowershellTask.cs" />
-        </Task>
-    </UsingTask>
-</Project>
\ No newline at end of file
+    <UsingTask TaskName="InvokePowershellTask" AssemblyFile="$(BuildCommonRoot)X2ModBuildCommon.dll" />
+</Project>
diff --git a/junction.exe b/junction.exe
deleted file mode 100644
index 29e42c8..0000000
Binary files a/junction.exe and /dev/null differ
diff --git a/package.ps1 b/package.ps1
new file mode 100644
index 0000000..0491711
--- /dev/null
+++ b/package.ps1
@@ -0,0 +1,51 @@
+$ErrorActionPreference = "Stop"
+Set-StrictMode -Version 3.0
+Add-Type -Assembly 'System.IO.Compression.FileSystem'
+
+$junctionVersion = "v1.0.0"
+$junctionLink = "https://github.com/robojumper/free-junc/releases/download/$junctionVersion/free-junc.exe.zip"
+
+$myDirectory = Split-Path $MyInvocation.MyCommand.Path
+$targetDir = Join-Path -Path $myDirectory "target"
+$packageDir = Join-Path -Path $targetDir "package"
+$cacheDir = Join-Path -Path $targetDir "cache"
+
+function Ensure-Directory {
+    [CmdletBinding()]
+    param ([Parameter(ValueFromPipeline)] [string] $dir)
+    process {
+        if (-not (Test-Path $dir)) {
+            New-Item -Path $dir -ItemType Directory
+        }
+    }
+}
+
+Ensure-Directory $targetDir
+Ensure-Directory $packageDir
+Ensure-Directory $cacheDir
+
+$junctionCacheDir = "$cacheDir\free-junc-$($junctionVersion)\"
+$junctionZip = "$($junctionCacheDir)free-junc.exe.zip"
+$junctionExe = "$($junctionCacheDir)free-junc.exe"
+
+if (-not (Test-Path -Path $junctionZip)) {
+    Ensure-Directory $junctionCacheDir
+    Invoke-WebRequest -UseBasicParsing -Uri $junctionLink -OutFile $junctionZip
+}
+
+if (-not (Test-Path -Path $junctionExe)) {
+    [System.IO.Compression.ZipFile]::ExtractToDirectory($junctionZip, $junctionCacheDir)
+}
+
+& "MSBuild.exe" ".\src\cs\X2ModBuildCommon.csproj"
+
+if (Test-Path -Path "$packageDir\*") {
+    Remove-Item -Force -Recurse -Path "$packageDir\*" -WarningAction SilentlyContinue -ErrorAction SilentlyContinue
+}
+
+Copy-Item -Force "$myDirectory\LICENSE" "$packageDir\" -WarningAction SilentlyContinue
+Copy-Item -Force "$myDirectory\README.md" "$packageDir\" -WarningAction SilentlyContinue
+Copy-Item -Force "$junctionExe" "$packageDir\junction.exe" -WarningAction SilentlyContinue
+Copy-Item -Force "$cacheDir\X2ModBuildCommon\X2ModBuildCommon.dll" "$packageDir\" -WarningAction SilentlyContinue
+Copy-Item -Force "$myDirectory\src\ps\*.ps1" "$packageDir\" -WarningAction SilentlyContinue
+Copy-Item -Force "$myDirectory\assets\*" "$packageDir\" -WarningAction SilentlyContinue
diff --git a/InvokePowershellTask.cs b/src/cs/InvokePowershellTask.cs
similarity index 100%
rename from InvokePowershellTask.cs
rename to src/cs/InvokePowershellTask.cs
diff --git a/src/cs/X2ModBuildCommon.csproj b/src/cs/X2ModBuildCommon.csproj
new file mode 100644
index 0000000..3e93f0e
--- /dev/null
+++ b/src/cs/X2ModBuildCommon.csproj
@@ -0,0 +1,32 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <AssemblyName>X2ModBuildCommon</AssemblyName>
+    <OutputPath>..\..\target\cache\X2ModBuildCommon\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="InvokePowershellTask.cs" />
+  </ItemGroup>
+
+  <Target Name="Build" Inputs="@(Compile)" Outputs="$(OutputPath)$(AssemblyName).dll">
+    <MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')" />
+    <ItemGroup>
+      <Assemblies Include="System.dll" />
+      <Assemblies Include="mscorlib.dll" />
+      <Assemblies Include="Microsoft.Build.Framework.dll" />
+      <Assemblies Include="Microsoft.Build.Utilities.v4.0.dll" />
+      <!--<Assemblies Include="System.Management.Automation.dll" />-->
+      <Assemblies Include="C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll" />
+      <!--<Assemblies Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\WindowsPowerShell\3.0\System.Management.Automation.dll" />-->
+      <!--<Assemblies Include="C:\WINDOWS\assembly\GAC_MSIL\System.Management.Automation\1.0.0.0__31bf3856ad364e35\System.Management.Automation.dll" />-->
+    </ItemGroup>
+    <Csc
+      Sources="@(Compile)" OutputAssembly="$(OutputPath)$(AssemblyName).dll"
+      TargetType="Library"
+      References="@(Assemblies)"
+    />
+  </Target>
+  <Target Name="Clean" >
+    <Delete Files="$(OutputPath)$(AssemblyName).dll" />
+  </Target>
+  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
+</Project>
diff --git a/build_common.ps1 b/src/ps/build_common.ps1
similarity index 100%
rename from build_common.ps1
rename to src/ps/build_common.ps1
diff --git a/clean.ps1 b/src/ps/clean.ps1
similarity index 100%
rename from clean.ps1
rename to src/ps/clean.ps1