diff --git a/astar/Edge.cs b/Graph/Edge.cs
similarity index 100%
rename from astar/Edge.cs
rename to Graph/Edge.cs
diff --git a/Graph/Graph.csproj b/Graph/Graph.csproj
new file mode 100644
index 0000000..132c02c
--- /dev/null
+++ b/Graph/Graph.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/astar/Node.cs b/Graph/Node.cs
similarity index 100%
rename from astar/Node.cs
rename to Graph/Node.cs
diff --git a/OpenStreetMap Importer/Importer.cs b/OpenStreetMap Importer/Importer.cs
index 57393d1..803e60a 100644
--- a/OpenStreetMap Importer/Importer.cs	
+++ b/OpenStreetMap Importer/Importer.cs	
@@ -32,10 +32,10 @@ namespace OpenStreetMap_Importer
                 }
                 else if (reader.Name == "way")
                 {
-                    if(currentNodeType == nodeType.WAY)
+                    if(currentNodeType == nodeType.WAY && currentWay.nodes.Count > 1)
                     {
                         ImportWay(currentWay);
-                        logger.log(loglevel.INFO, "Way nodes: {0} Weight: {1}", currentWay.nodes.Count);
+                        logger.log(loglevel.INFO, "Way nodes: {0}", currentWay.nodes.Count);
                     }
                     currentNodeType = nodeType.WAY;
                     currentNode = nullNode;
diff --git a/OpenStreetMap Importer/OpenStreetMap Importer.csproj b/OpenStreetMap Importer/OpenStreetMap Importer.csproj
index 543ca41..c123f25 100644
--- a/OpenStreetMap Importer/OpenStreetMap Importer.csproj	
+++ b/OpenStreetMap Importer/OpenStreetMap Importer.csproj	
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Graph\Graph.csproj" />
+    <ProjectReference Include="..\Logging\Logging.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/astar/astar.csproj b/astar/astar.csproj
index f3c2557..d1cd67a 100644
--- a/astar/astar.csproj
+++ b/astar/astar.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Graph\Graph.csproj" />
     <ProjectReference Include="..\Logging\Logging.csproj" />
     <ProjectReference Include="..\OpenStreetMap Importer\OpenStreetMap Importer.csproj" />
   </ItemGroup>
diff --git a/astar/astar.sln b/astar/astar.sln
index 493d7f8..f990f57 100644
--- a/astar/astar.sln
+++ b/astar/astar.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Executable", "..\Executable
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenStreetMap Importer", "..\OpenStreetMap Importer\OpenStreetMap Importer.csproj", "{1E918E64-866F-4386-AA44-AF7120A9294F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Graph", "..\Graph\Graph.csproj", "{41576467-1FC5-49CE-B5B3-832EEED353DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Graph", "..\Graph\Graph.csproj", "{FD19250E-516C-4AFF-A08A-E89D036F5FE2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +35,10 @@ Global
 		{1E918E64-866F-4386-AA44-AF7120A9294F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E918E64-866F-4386-AA44-AF7120A9294F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E918E64-866F-4386-AA44-AF7120A9294F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41576467-1FC5-49CE-B5B3-832EEED353DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD19250E-516C-4AFF-A08A-E89D036F5FE2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE