diff --git a/.github/workflows/build-and-publish-alpha.yml b/.github/workflows/build-and-publish-alpha.yml
index a5dc2e9d5..6535218f4 100644
--- a/.github/workflows/build-and-publish-alpha.yml
+++ b/.github/workflows/build-and-publish-alpha.yml
@@ -59,3 +59,4 @@ jobs:
           dotnet nuget push ./nupkg/Hypar.Elements.Serialization.DXF.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
           dotnet nuget push ./nupkg/Hypar.Elements.Serialization.IFC.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
           dotnet nuget push ./nupkg/Hypar.Elements.Components.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
+          dotnet nuget push ./nupkg/Hypar.Elements.MEP.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
diff --git a/.github/workflows/publish-on-tag.yml b/.github/workflows/publish-on-tag.yml
index aab661b09..15984468f 100644
--- a/.github/workflows/publish-on-tag.yml
+++ b/.github/workflows/publish-on-tag.yml
@@ -26,3 +26,4 @@ jobs:
           dotnet nuget push ./nupkg/Hypar.Elements.Serialization.DXF.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
           dotnet nuget push ./nupkg/Hypar.Elements.Serialization.IFC.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
           dotnet nuget push ./nupkg/Hypar.Elements.Components.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
+          dotnet nuget push ./nupkg/Hypar.Elements.MEP.${{ env.NUGET_VERSION }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}}
diff --git a/Elements.MEP/src/Elements.MEP.csproj b/Elements.MEP/src/Elements.MEP.csproj
index 3cc6021b4..b91b6f61d 100644
--- a/Elements.MEP/src/Elements.MEP.csproj
+++ b/Elements.MEP/src/Elements.MEP.csproj
@@ -2,10 +2,10 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <AssemblyName>Elements.MEP</AssemblyName>
+        <AssemblyName>Hypar.Elements.MEP</AssemblyName>
         <PackageTitle>Elements.MEP</PackageTitle>
         <Title>Elements MEP</Title>
-        <PackageId>Elements.MEP</PackageId>
+        <PackageId>Hypar.Elements.MEP</PackageId>
         <PackageDescription>MEP system design using Elements.</PackageDescription>
         <Summary>A suite of tools for generative design of MEP systems built on Hypar.Elements.</Summary>
         <PackageProjectUrl>https://github.com/hypar-io/Elements</PackageProjectUrl>
diff --git a/Elements.sln b/Elements.sln
index 7b2f88295..25b657845 100644
--- a/Elements.sln
+++ b/Elements.sln
@@ -35,6 +35,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elements.Serialization.SVG"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elements.Serialization.SVG.Tests", "Elements.Serialization.SVG\test\Elements.Serialization.SVG.Tests.csproj", "{46344125-87C3-4C4C-9F71-6DBF854CB6A9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Elements.MEP", "Elements.MEP", "{B1A55EC8-8D38-40E2-B55E-88BE02571742}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elements.MEP", "Elements.MEP\src\Elements.MEP.csproj", "{195D9163-DA41-481A-860F-E5A3D546587B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elements.MEP.Tests", "Elements.MEP\test\Elements.MEP.Tests.csproj", "{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -180,6 +186,30 @@ Global
 		{46344125-87C3-4C4C-9F71-6DBF854CB6A9}.Release|x64.Build.0 = Release|Any CPU
 		{46344125-87C3-4C4C-9F71-6DBF854CB6A9}.Release|x86.ActiveCfg = Release|Any CPU
 		{46344125-87C3-4C4C-9F71-6DBF854CB6A9}.Release|x86.Build.0 = Release|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Debug|x64.Build.0 = Debug|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Debug|x86.Build.0 = Debug|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Release|x64.ActiveCfg = Release|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Release|x64.Build.0 = Release|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Release|x86.ActiveCfg = Release|Any CPU
+		{195D9163-DA41-481A-860F-E5A3D546587B}.Release|x86.Build.0 = Release|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Debug|x64.Build.0 = Debug|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Debug|x86.Build.0 = Debug|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Release|x64.ActiveCfg = Release|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Release|x64.Build.0 = Release|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Release|x86.ActiveCfg = Release|Any CPU
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{9EFEF392-5D85-42A5-B1D8-4145B73CD6E3} = {0A630254-C5C5-4C00-A924-115C1F68EC17}
@@ -191,5 +221,7 @@ Global
 		{925C4B23-421D-48E3-96A0-EDC4AD37324C} = {8A446BC4-B63B-4E33-A48F-21074B0651E0}
 		{6FE1CB22-8837-4B8B-A7CE-1267B53DF6D3} = {ECD9CF40-34C0-487C-A1C1-CA5B2EBF61A7}
 		{46344125-87C3-4C4C-9F71-6DBF854CB6A9} = {ECD9CF40-34C0-487C-A1C1-CA5B2EBF61A7}
+		{195D9163-DA41-481A-860F-E5A3D546587B} = {B1A55EC8-8D38-40E2-B55E-88BE02571742}
+		{FBDD5B90-BCBA-4373-83CD-0FCE6B38DA08} = {B1A55EC8-8D38-40E2-B55E-88BE02571742}
 	EndGlobalSection
 EndGlobal