diff --git a/.gitignore b/.gitignore
index 4f72b31..b1e3a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *bin*
-*obj*
\ No newline at end of file
+*obj*
+.vs\*
\ No newline at end of file
diff --git a/.vs/AppInfoParser/FileContentIndex/88ed4310-ca3f-40df-9723-275034ad40f6.vsidx b/.vs/AppInfoParser/FileContentIndex/88ed4310-ca3f-40df-9723-275034ad40f6.vsidx
new file mode 100644
index 0000000..b48177b
Binary files /dev/null and b/.vs/AppInfoParser/FileContentIndex/88ed4310-ca3f-40df-9723-275034ad40f6.vsidx differ
diff --git a/.vs/AppInfoParser/FileContentIndex/read.lock b/.vs/AppInfoParser/FileContentIndex/read.lock
new file mode 100644
index 0000000..e69de29
diff --git a/.vs/AppInfoParser/v17/.suo b/.vs/AppInfoParser/v17/.suo
new file mode 100644
index 0000000..543bb82
Binary files /dev/null and b/.vs/AppInfoParser/v17/.suo differ
diff --git a/.vs/CXMLCli/FileContentIndex/ae9de32c-3ee9-4742-a248-881c43d1f654.vsidx b/.vs/CXMLCli/FileContentIndex/ae9de32c-3ee9-4742-a248-881c43d1f654.vsidx
new file mode 100644
index 0000000..fae2188
Binary files /dev/null and b/.vs/CXMLCli/FileContentIndex/ae9de32c-3ee9-4742-a248-881c43d1f654.vsidx differ
diff --git a/.vs/CXMLCli/FileContentIndex/read.lock b/.vs/CXMLCli/FileContentIndex/read.lock
new file mode 100644
index 0000000..e69de29
diff --git a/.vs/CXMLCli/v17/.suo b/.vs/CXMLCli/v17/.suo
new file mode 100644
index 0000000..3e7740f
Binary files /dev/null and b/.vs/CXMLCli/v17/.suo differ
diff --git a/AppInfoParser.sln b/CXMLCli.sln
similarity index 95%
rename from AppInfoParser.sln
rename to CXMLCli.sln
index caf8863..fa5667b 100644
--- a/AppInfoParser.sln
+++ b/CXMLCli.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CXMLCli", "AppInfoCli\CXMLCli.csproj", "{BE72E673-25FF-47AB-AF5B-9448B69E3990}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CXMLCli", "CXMLCli\CXMLCli.csproj", "{BE72E673-25FF-47AB-AF5B-9448B69E3990}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/AppInfoCli/App.config b/CXMLCli/App.config
similarity index 100%
rename from AppInfoCli/App.config
rename to CXMLCli/App.config
diff --git a/AppInfoCli/CXMLBuilder.cs b/CXMLCli/CXMLBuilder.cs
similarity index 100%
rename from AppInfoCli/CXMLBuilder.cs
rename to CXMLCli/CXMLBuilder.cs
diff --git a/AppInfoCli/CXMLCli.csproj b/CXMLCli/CXMLCli.csproj
similarity index 100%
rename from AppInfoCli/CXMLCli.csproj
rename to CXMLCli/CXMLCli.csproj
diff --git a/AppInfoCli/CXMLReader.cs b/CXMLCli/CXMLReader.cs
similarity index 99%
rename from AppInfoCli/CXMLReader.cs
rename to CXMLCli/CXMLReader.cs
index ea2213e..f04c60b 100644
--- a/AppInfoCli/CXMLReader.cs
+++ b/CXMLCli/CXMLReader.cs
@@ -523,7 +523,7 @@ namespace CXML
 
                     Process Proc = new Process();
                     Proc.StartInfo.FileName = Path.Combine("GimConv", "GimConv.exe");
-                    Proc.StartInfo.Arguments = Path.GetFileName(FileName) + " -o " + Path.Combine(Environment.CurrentDirectory, DirectoryName, Path.GetFileName(Path.ChangeExtension(FileName, "png")));
+                    Proc.StartInfo.Arguments = "\"" + Path.GetFileName(FileName) + "\" -o \"" + Path.Combine(Environment.CurrentDirectory, DirectoryName, Path.GetFileName(Path.ChangeExtension(FileName, "png"))) + "\"";
                     Proc.StartInfo.RedirectStandardOutput = true;
                     Proc.StartInfo.RedirectStandardError = true;
                     Proc.StartInfo.UseShellExecute = false;
diff --git a/AppInfoCli/GimConv.cs b/CXMLCli/GimConv.cs
similarity index 100%
rename from AppInfoCli/GimConv.cs
rename to CXMLCli/GimConv.cs
diff --git a/AppInfoCli/Program.cs b/CXMLCli/Program.cs
similarity index 100%
rename from AppInfoCli/Program.cs
rename to CXMLCli/Program.cs
diff --git a/AppInfoCli/Properties/AssemblyInfo.cs b/CXMLCli/Properties/AssemblyInfo.cs
similarity index 100%
rename from AppInfoCli/Properties/AssemblyInfo.cs
rename to CXMLCli/Properties/AssemblyInfo.cs
diff --git a/AppInfoCli/Tools.cs b/CXMLCli/Tools.cs
similarity index 100%
rename from AppInfoCli/Tools.cs
rename to CXMLCli/Tools.cs
diff --git a/AppInfoCli/VAG.cs b/CXMLCli/VAG.cs
similarity index 100%
rename from AppInfoCli/VAG.cs
rename to CXMLCli/VAG.cs
diff --git a/AppInfoCli/cxml.ico b/CXMLCli/cxml.ico
similarity index 100%
rename from AppInfoCli/cxml.ico
rename to CXMLCli/cxml.ico
diff --git a/AppInfoCli/packages.config b/CXMLCli/packages.config
similarity index 100%
rename from AppInfoCli/packages.config
rename to CXMLCli/packages.config