diff --git a/Grille.BeamNGLib/Collections/IDictionaryExtension.cs b/Grille.BeamNG.Lib/Collections/IDictionaryExtension.cs
similarity index 100%
rename from Grille.BeamNGLib/Collections/IDictionaryExtension.cs
rename to Grille.BeamNG.Lib/Collections/IDictionaryExtension.cs
diff --git a/Grille.BeamNGLib/Collections/IKeyed.cs b/Grille.BeamNG.Lib/Collections/IKeyed.cs
similarity index 100%
rename from Grille.BeamNGLib/Collections/IKeyed.cs
rename to Grille.BeamNG.Lib/Collections/IKeyed.cs
diff --git a/Grille.BeamNGLib/Collections/KeyedCollection.cs b/Grille.BeamNG.Lib/Collections/KeyedCollection.cs
similarity index 100%
rename from Grille.BeamNGLib/Collections/KeyedCollection.cs
rename to Grille.BeamNG.Lib/Collections/KeyedCollection.cs
diff --git a/Grille.BeamNGLib/Grille.BeamNgLib.csproj b/Grille.BeamNG.Lib/Grille.BeamNG.Lib.csproj
similarity index 95%
rename from Grille.BeamNGLib/Grille.BeamNgLib.csproj
rename to Grille.BeamNG.Lib/Grille.BeamNG.Lib.csproj
index 765b5c5..ce3cc71 100644
--- a/Grille.BeamNGLib/Grille.BeamNgLib.csproj
+++ b/Grille.BeamNG.Lib/Grille.BeamNG.Lib.csproj
@@ -34,7 +34,7 @@
-
+
diff --git a/Grille.BeamNGLib/IO/BeamJsonSerializer.cs b/Grille.BeamNG.Lib/IO/BeamJsonSerializer.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/BeamJsonSerializer.cs
rename to Grille.BeamNG.Lib/IO/BeamJsonSerializer.cs
diff --git a/Grille.BeamNGLib/IO/Binary/TerrainV9Binary.cs b/Grille.BeamNG.Lib/IO/Binary/TerrainV9Binary.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Binary/TerrainV9Binary.cs
rename to Grille.BeamNG.Lib/IO/Binary/TerrainV9Binary.cs
diff --git a/Grille.BeamNGLib/IO/JsonDictSerializer.cs b/Grille.BeamNG.Lib/IO/JsonDictSerializer.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/JsonDictSerializer.cs
rename to Grille.BeamNG.Lib/IO/JsonDictSerializer.cs
diff --git a/Grille.BeamNGLib/IO/Resources/FileResource.cs b/Grille.BeamNG.Lib/IO/Resources/FileResource.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Resources/FileResource.cs
rename to Grille.BeamNG.Lib/IO/Resources/FileResource.cs
diff --git a/Grille.BeamNGLib/IO/Resources/GroupResource.cs b/Grille.BeamNG.Lib/IO/Resources/GroupResource.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Resources/GroupResource.cs
rename to Grille.BeamNG.Lib/IO/Resources/GroupResource.cs
diff --git a/Grille.BeamNGLib/IO/Resources/PathEvaluator.cs b/Grille.BeamNG.Lib/IO/Resources/PathEvaluator.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Resources/PathEvaluator.cs
rename to Grille.BeamNG.Lib/IO/Resources/PathEvaluator.cs
diff --git a/Grille.BeamNGLib/IO/Resources/Resource.cs b/Grille.BeamNG.Lib/IO/Resources/Resource.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Resources/Resource.cs
rename to Grille.BeamNG.Lib/IO/Resources/Resource.cs
diff --git a/Grille.BeamNGLib/IO/Resources/ResourceCollection.cs b/Grille.BeamNG.Lib/IO/Resources/ResourceCollection.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Resources/ResourceCollection.cs
rename to Grille.BeamNG.Lib/IO/Resources/ResourceCollection.cs
diff --git a/Grille.BeamNGLib/IO/Resources/StaticPath.cs b/Grille.BeamNG.Lib/IO/Resources/StaticPath.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Resources/StaticPath.cs
rename to Grille.BeamNG.Lib/IO/Resources/StaticPath.cs
diff --git a/Grille.BeamNGLib/IO/Resources/ZipFileResource.cs b/Grille.BeamNG.Lib/IO/Resources/ZipFileResource.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/Resources/ZipFileResource.cs
rename to Grille.BeamNG.Lib/IO/Resources/ZipFileResource.cs
diff --git a/Grille.BeamNGLib/IO/SimItemsJsonSerializer.cs b/Grille.BeamNG.Lib/IO/SimItemsJsonSerializer.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/SimItemsJsonSerializer.cs
rename to Grille.BeamNG.Lib/IO/SimItemsJsonSerializer.cs
diff --git a/Grille.BeamNGLib/IO/TerrainV9Serializer.cs b/Grille.BeamNG.Lib/IO/TerrainV9Serializer.cs
similarity index 99%
rename from Grille.BeamNGLib/IO/TerrainV9Serializer.cs
rename to Grille.BeamNG.Lib/IO/TerrainV9Serializer.cs
index e1b74e5..359d1f6 100644
--- a/Grille.BeamNGLib/IO/TerrainV9Serializer.cs
+++ b/Grille.BeamNG.Lib/IO/TerrainV9Serializer.cs
@@ -1,5 +1,5 @@
using System.Text;
-using GGL.IO;
+using Grille.IO;
using Grille.BeamNG.IO.Binary;
namespace Grille.BeamNG.IO;
diff --git a/Grille.BeamNGLib/IO/ZipFileManager.cs b/Grille.BeamNG.Lib/IO/ZipFileManager.cs
similarity index 100%
rename from Grille.BeamNGLib/IO/ZipFileManager.cs
rename to Grille.BeamNG.Lib/IO/ZipFileManager.cs
diff --git a/Grille.BeamNGLib/LevelBuilder.cs b/Grille.BeamNG.Lib/LevelBuilder.cs
similarity index 100%
rename from Grille.BeamNGLib/LevelBuilder.cs
rename to Grille.BeamNG.Lib/LevelBuilder.cs
diff --git a/Grille.BeamNGLib/LevelInfo.cs b/Grille.BeamNG.Lib/LevelInfo.cs
similarity index 100%
rename from Grille.BeamNGLib/LevelInfo.cs
rename to Grille.BeamNG.Lib/LevelInfo.cs
diff --git a/Grille.BeamNGLib/Logging/ErrorLogger.cs b/Grille.BeamNG.Lib/Logging/ErrorLogger.cs
similarity index 100%
rename from Grille.BeamNGLib/Logging/ErrorLogger.cs
rename to Grille.BeamNG.Lib/Logging/ErrorLogger.cs
diff --git a/Grille.BeamNGLib/Logging/Logger.cs b/Grille.BeamNG.Lib/Logging/Logger.cs
similarity index 100%
rename from Grille.BeamNGLib/Logging/Logger.cs
rename to Grille.BeamNG.Lib/Logging/Logger.cs
diff --git a/Grille.BeamNGLib/README.md b/Grille.BeamNG.Lib/README.md
similarity index 100%
rename from Grille.BeamNGLib/README.md
rename to Grille.BeamNG.Lib/README.md
diff --git a/Grille.BeamNGLib/SceneTree/Art/ArtGroup.cs b/Grille.BeamNG.Lib/SceneTree/Art/ArtGroup.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ArtGroup.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ArtGroup.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/ArtGroupRoot.cs b/Grille.BeamNG.Lib/SceneTree/Art/ArtGroupRoot.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ArtGroupRoot.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ArtGroupRoot.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/ArtGroupShapes.cs b/Grille.BeamNG.Lib/SceneTree/Art/ArtGroupShapes.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ArtGroupShapes.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ArtGroupShapes.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/ArtItem.cs b/Grille.BeamNG.Lib/SceneTree/Art/ArtItem.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ArtItem.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ArtItem.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/ArtItemsCollection.cs b/Grille.BeamNG.Lib/SceneTree/Art/ArtItemsCollection.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ArtItemsCollection.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ArtItemsCollection.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/ForestItemData.cs b/Grille.BeamNG.Lib/SceneTree/Art/ForestItemData.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ForestItemData.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ForestItemData.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/ManagedItems.cs b/Grille.BeamNG.Lib/SceneTree/Art/ManagedItems.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ManagedItems.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ManagedItems.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/Material.cs b/Grille.BeamNG.Lib/SceneTree/Art/Material.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/Material.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/Material.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/MaterialItems.cs b/Grille.BeamNG.Lib/SceneTree/Art/MaterialItems.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/MaterialItems.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/MaterialItems.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/ObjectMaterial.cs b/Grille.BeamNG.Lib/SceneTree/Art/ObjectMaterial.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/ObjectMaterial.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/ObjectMaterial.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/TerrainMaterial.cs b/Grille.BeamNG.Lib/SceneTree/Art/TerrainMaterial.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/TerrainMaterial.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/TerrainMaterial.cs
diff --git a/Grille.BeamNGLib/SceneTree/Art/TerrainMaterialTextureSet.cs b/Grille.BeamNG.Lib/SceneTree/Art/TerrainMaterialTextureSet.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Art/TerrainMaterialTextureSet.cs
rename to Grille.BeamNG.Lib/SceneTree/Art/TerrainMaterialTextureSet.cs
diff --git a/Grille.BeamNGLib/SceneTree/ISceneTreeGroup.cs b/Grille.BeamNG.Lib/SceneTree/ISceneTreeGroup.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/ISceneTreeGroup.cs
rename to Grille.BeamNG.Lib/SceneTree/ISceneTreeGroup.cs
diff --git a/Grille.BeamNGLib/SceneTree/JsonDictArrayProperty.cs b/Grille.BeamNG.Lib/SceneTree/JsonDictArrayProperty.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/JsonDictArrayProperty.cs
rename to Grille.BeamNG.Lib/SceneTree/JsonDictArrayProperty.cs
diff --git a/Grille.BeamNGLib/SceneTree/JsonDictProperty.cs b/Grille.BeamNG.Lib/SceneTree/JsonDictProperty.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/JsonDictProperty.cs
rename to Grille.BeamNG.Lib/SceneTree/JsonDictProperty.cs
diff --git a/Grille.BeamNGLib/SceneTree/JsonDictWrapper.cs b/Grille.BeamNG.Lib/SceneTree/JsonDictWrapper.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/JsonDictWrapper.cs
rename to Grille.BeamNG.Lib/SceneTree/JsonDictWrapper.cs
diff --git a/Grille.BeamNGLib/SceneTree/JsonDictWrapperCollection.cs b/Grille.BeamNG.Lib/SceneTree/JsonDictWrapperCollection.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/JsonDictWrapperCollection.cs
rename to Grille.BeamNG.Lib/SceneTree/JsonDictWrapperCollection.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/GroundCover.cs b/Grille.BeamNG.Lib/SceneTree/Main/GroundCover.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/GroundCover.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/GroundCover.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/GroundCoverInstance.cs b/Grille.BeamNG.Lib/SceneTree/Main/GroundCoverInstance.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/GroundCoverInstance.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/GroundCoverInstance.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/SimGroup.cs b/Grille.BeamNG.Lib/SceneTree/Main/SimGroup.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/SimGroup.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/SimGroup.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/SimGroupLevelObjects.cs b/Grille.BeamNG.Lib/SceneTree/Main/SimGroupLevelObjects.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/SimGroupLevelObjects.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/SimGroupLevelObjects.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/SimGroupMissionGroup.cs b/Grille.BeamNG.Lib/SceneTree/Main/SimGroupMissionGroup.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/SimGroupMissionGroup.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/SimGroupMissionGroup.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/SimGroupRoot.cs b/Grille.BeamNG.Lib/SceneTree/Main/SimGroupRoot.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/SimGroupRoot.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/SimGroupRoot.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/SimItem.cs b/Grille.BeamNG.Lib/SceneTree/Main/SimItem.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/SimItem.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/SimItem.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/SimItemCollection.cs b/Grille.BeamNG.Lib/SceneTree/Main/SimItemCollection.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/SimItemCollection.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/SimItemCollection.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/SpawnSphere.cs b/Grille.BeamNG.Lib/SceneTree/Main/SpawnSphere.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/SpawnSphere.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/SpawnSphere.cs
diff --git a/Grille.BeamNGLib/SceneTree/Main/TerrainBlock.cs b/Grille.BeamNG.Lib/SceneTree/Main/TerrainBlock.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/Main/TerrainBlock.cs
rename to Grille.BeamNG.Lib/SceneTree/Main/TerrainBlock.cs
diff --git a/Grille.BeamNGLib/SceneTree/TypeRegistry/ItemClassRegistry.cs b/Grille.BeamNG.Lib/SceneTree/TypeRegistry/ItemClassRegistry.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/TypeRegistry/ItemClassRegistry.cs
rename to Grille.BeamNG.Lib/SceneTree/TypeRegistry/ItemClassRegistry.cs
diff --git a/Grille.BeamNGLib/SceneTree/TypeRegistry/JsonDictPropertyTypeRegistry.cs b/Grille.BeamNG.Lib/SceneTree/TypeRegistry/JsonDictPropertyTypeRegistry.cs
similarity index 100%
rename from Grille.BeamNGLib/SceneTree/TypeRegistry/JsonDictPropertyTypeRegistry.cs
rename to Grille.BeamNG.Lib/SceneTree/TypeRegistry/JsonDictPropertyTypeRegistry.cs
diff --git a/Grille.BeamNGLib/Terrain.cs b/Grille.BeamNG.Lib/Terrain.cs
similarity index 100%
rename from Grille.BeamNGLib/Terrain.cs
rename to Grille.BeamNG.Lib/Terrain.cs
diff --git a/Grille.BeamNGLib/TerrainTemplate.cs b/Grille.BeamNG.Lib/TerrainTemplate.cs
similarity index 100%
rename from Grille.BeamNGLib/TerrainTemplate.cs
rename to Grille.BeamNG.Lib/TerrainTemplate.cs
diff --git a/Grille.BeamNGLib/usings.cs b/Grille.BeamNG.Lib/usings.cs
similarity index 100%
rename from Grille.BeamNGLib/usings.cs
rename to Grille.BeamNG.Lib/usings.cs
diff --git a/Grille.BeamNGLib_Tests/Grille.BeamNgLib_Tests.csproj b/Grille.BeamNG.Lib_Tests/Grille.BeamNG.Lib_Tests.csproj
similarity index 83%
rename from Grille.BeamNGLib_Tests/Grille.BeamNgLib_Tests.csproj
rename to Grille.BeamNG.Lib_Tests/Grille.BeamNG.Lib_Tests.csproj
index c02d4fc..6d4652c 100644
--- a/Grille.BeamNGLib_Tests/Grille.BeamNgLib_Tests.csproj
+++ b/Grille.BeamNG.Lib_Tests/Grille.BeamNG.Lib_Tests.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/Grille.BeamNGLib_Tests/Program.cs b/Grille.BeamNG.Lib_Tests/Program.cs
similarity index 100%
rename from Grille.BeamNGLib_Tests/Program.cs
rename to Grille.BeamNG.Lib_Tests/Program.cs
diff --git a/Grille.BeamNGLib_Tests/Terrain.cs b/Grille.BeamNG.Lib_Tests/Terrain.cs
similarity index 100%
rename from Grille.BeamNGLib_Tests/Terrain.cs
rename to Grille.BeamNG.Lib_Tests/Terrain.cs
diff --git a/Grille.BeamNGLib_Tests/Utils.cs b/Grille.BeamNG.Lib_Tests/Utils.cs
similarity index 100%
rename from Grille.BeamNGLib_Tests/Utils.cs
rename to Grille.BeamNG.Lib_Tests/Utils.cs
diff --git a/Grille.BeamNGLib_Tests/usings.cs b/Grille.BeamNG.Lib_Tests/usings.cs
similarity index 100%
rename from Grille.BeamNGLib_Tests/usings.cs
rename to Grille.BeamNG.Lib_Tests/usings.cs
diff --git a/LevelTemplateCreator.sln b/LevelTemplateCreator.sln
index 70c6670..1b11203 100644
--- a/LevelTemplateCreator.sln
+++ b/LevelTemplateCreator.sln
@@ -13,9 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
README.md = README.md
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grille.BeamNgLib", "Grille.BeamNGLib\Grille.BeamNgLib.csproj", "{71707660-F679-4412-AC29-0358B3D29738}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grille.BeamNG.Lib", "Grille.BeamNG.Lib\Grille.BeamNG.Lib.csproj", "{71707660-F679-4412-AC29-0358B3D29738}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grille.BeamNgLib_Tests", "Grille.BeamNGLib_Tests\Grille.BeamNgLib_Tests.csproj", "{5435185E-3DDF-4D35-BF74-E79A8ECD649C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grille.BeamNG.Lib_Tests", "Grille.BeamNG.Lib_Tests\Grille.BeamNG.Lib_Tests.csproj", "{5435185E-3DDF-4D35-BF74-E79A8ECD649C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/LevelTemplateCreator/LevelTemplateCreator.csproj b/LevelTemplateCreator/LevelTemplateCreator.csproj
index 0ea22b1..27550d5 100644
--- a/LevelTemplateCreator/LevelTemplateCreator.csproj
+++ b/LevelTemplateCreator/LevelTemplateCreator.csproj
@@ -18,7 +18,7 @@
-
+