diff --git a/MdlxConverterGuhub.sln b/MdlxConverter.sln
similarity index 93%
rename from MdlxConverterGuhub.sln
rename to MdlxConverter.sln
index e76068e..b8b3ce9 100644
--- a/MdlxConverterGuhub.sln
+++ b/MdlxConverter.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28010.2003
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MdlxConverterGuhub", "MdlxConverterGuhub\MdlxConverterGuhub.vcxproj", "{CDEC948D-B201-4570-B8D5-27D6C7ADA49A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MdlxConverterCommandline", "src\MdlxConverterCommandline.vcxproj", "{CDEC948D-B201-4570-B8D5-27D6C7ADA49A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MdlxConverterGuhub/MdlxConverterGuhub.cpp b/MdlxConverterGuhub/MdlxConverterGuhub.cpp
deleted file mode 100644
index 7cfd947..0000000
Binary files a/MdlxConverterGuhub/MdlxConverterGuhub.cpp and /dev/null differ
diff --git a/MdlxConverterGuhub/pch.cpp b/MdlxConverterGuhub/pch.cpp
deleted file mode 100644
index a38f8a3..0000000
Binary files a/MdlxConverterGuhub/pch.cpp and /dev/null differ
diff --git a/MdlxConverterGuhub/pch.h b/MdlxConverterGuhub/pch.h
deleted file mode 100644
index d87432d..0000000
Binary files a/MdlxConverterGuhub/pch.h and /dev/null differ
diff --git a/MdlxConverterGuhub/MdlError.h b/src/MdlError.h
similarity index 100%
rename from MdlxConverterGuhub/MdlError.h
rename to src/MdlError.h
diff --git a/MdlxConverterGuhub/MdlLine.h b/src/MdlLine.h
similarity index 100%
rename from MdlxConverterGuhub/MdlLine.h
rename to src/MdlLine.h
diff --git a/MdlxConverterGuhub/MdlxConverterGuhub.vcxproj b/src/MdlxConverterCommandline.vcxproj
similarity index 92%
rename from MdlxConverterGuhub/MdlxConverterGuhub.vcxproj
rename to src/MdlxConverterCommandline.vcxproj
index f529ea0..a9939d5 100644
--- a/MdlxConverterGuhub/MdlxConverterGuhub.vcxproj
+++ b/src/MdlxConverterCommandline.vcxproj
@@ -24,6 +24,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>MdlxConverterGuhub</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <ProjectName>Mdlx Converter Command-line</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -133,7 +134,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -154,16 +155,9 @@
     <ClInclude Include="MdlError.h" />
     <ClInclude Include="MdlLine.h" />
     <ClInclude Include="MdlxData.h" />
-    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="MdlxConverterGuhub.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
+    <ClCompile Include="main.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/MdlxConverterGuhub/MdlxConverterGuhub.vcxproj.filters b/src/MdlxConverterCommandline.vcxproj.filters
similarity index 84%
rename from MdlxConverterGuhub/MdlxConverterGuhub.vcxproj.filters
rename to src/MdlxConverterCommandline.vcxproj.filters
index 3f90ab6..6c8cab2 100644
--- a/MdlxConverterGuhub/MdlxConverterGuhub.vcxproj.filters
+++ b/src/MdlxConverterCommandline.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="MdlError.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -29,10 +26,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MdlxConverterGuhub.cpp">
+    <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/MdlxConverterGuhub/MdlxData.h b/src/MdlxData.h
similarity index 100%
rename from MdlxConverterGuhub/MdlxData.h
rename to src/MdlxData.h
diff --git a/MdlxConverterGuhub/Source.cpp b/src/Source.cpp
similarity index 100%
rename from MdlxConverterGuhub/Source.cpp
rename to src/Source.cpp
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 0000000..4efd96f
Binary files /dev/null and b/src/main.cpp differ