diff --git a/exceptions.h b/include/exceptions.h
similarity index 100%
rename from exceptions.h
rename to include/exceptions.h
diff --git a/ltnode.h b/include/ltnode.h
similarity index 100%
rename from ltnode.h
rename to include/ltnode.h
diff --git a/node.h b/include/node.h
similarity index 100%
rename from node.h
rename to include/node.h
diff --git a/parser.h b/include/parser.h
similarity index 100%
rename from parser.h
rename to include/parser.h
diff --git a/parserstate.h b/include/parserstate.h
similarity index 100%
rename from parserstate.h
rename to include/parserstate.h
diff --git a/content.cpp b/src/content.cpp
similarity index 100%
rename from content.cpp
rename to src/content.cpp
diff --git a/content.h b/src/content.h
similarity index 100%
rename from content.h
rename to src/content.h
diff --git a/exp.cpp b/src/exp.cpp
similarity index 100%
rename from exp.cpp
rename to src/exp.cpp
diff --git a/exp.h b/src/exp.h
similarity index 100%
rename from exp.h
rename to src/exp.h
diff --git a/iterator.cpp b/src/iterator.cpp
similarity index 100%
rename from iterator.cpp
rename to src/iterator.cpp
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/map.cpp b/src/map.cpp
similarity index 100%
rename from map.cpp
rename to src/map.cpp
diff --git a/map.h b/src/map.h
similarity index 100%
rename from map.h
rename to src/map.h
diff --git a/node.cpp b/src/node.cpp
similarity index 100%
rename from node.cpp
rename to src/node.cpp
diff --git a/parser.cpp b/src/parser.cpp
similarity index 100%
rename from parser.cpp
rename to src/parser.cpp
diff --git a/parserstate.cpp b/src/parserstate.cpp
similarity index 100%
rename from parserstate.cpp
rename to src/parserstate.cpp
diff --git a/regex.cpp b/src/regex.cpp
similarity index 100%
rename from regex.cpp
rename to src/regex.cpp
diff --git a/regex.h b/src/regex.h
similarity index 100%
rename from regex.h
rename to src/regex.h
diff --git a/scalar.cpp b/src/scalar.cpp
similarity index 100%
rename from scalar.cpp
rename to src/scalar.cpp
diff --git a/scalar.h b/src/scalar.h
similarity index 100%
rename from scalar.h
rename to src/scalar.h
diff --git a/scanner.cpp b/src/scanner.cpp
similarity index 100%
rename from scanner.cpp
rename to src/scanner.cpp
diff --git a/scanner.h b/src/scanner.h
similarity index 100%
rename from scanner.h
rename to src/scanner.h
diff --git a/scanscalar.cpp b/src/scanscalar.cpp
similarity index 100%
rename from scanscalar.cpp
rename to src/scanscalar.cpp
diff --git a/scanscalar.h b/src/scanscalar.h
similarity index 100%
rename from scanscalar.h
rename to src/scanscalar.h
diff --git a/scantoken.cpp b/src/scantoken.cpp
similarity index 100%
rename from scantoken.cpp
rename to src/scantoken.cpp
diff --git a/sequence.cpp b/src/sequence.cpp
similarity index 100%
rename from sequence.cpp
rename to src/sequence.cpp
diff --git a/sequence.h b/src/sequence.h
similarity index 100%
rename from sequence.h
rename to src/sequence.h
diff --git a/simplekey.cpp b/src/simplekey.cpp
similarity index 100%
rename from simplekey.cpp
rename to src/simplekey.cpp
diff --git a/stream.cpp b/src/stream.cpp
similarity index 100%
rename from stream.cpp
rename to src/stream.cpp
diff --git a/stream.h b/src/stream.h
similarity index 100%
rename from stream.h
rename to src/stream.h
diff --git a/tests.cpp b/src/tests.cpp
similarity index 100%
rename from tests.cpp
rename to src/tests.cpp
diff --git a/tests.h b/src/tests.h
similarity index 100%
rename from tests.h
rename to src/tests.h
diff --git a/token.h b/src/token.h
similarity index 100%
rename from token.h
rename to src/token.h
diff --git a/tests/out.yaml b/tests/out.yaml
new file mode 100644
index 0000000..75b1228
--- /dev/null
+++ b/tests/out.yaml
@@ -0,0 +1,8 @@
+---
+- "basic node"
+- !<!howdy> "yeah baby"
+
+---
+- "basic node"
+- !<!<!howdy>> "yeah baby"
+
diff --git a/yaml-reader.vcproj b/yaml-reader.vcproj
index b708279..6ef5a5e 100644
--- a/yaml-reader.vcproj
+++ b/yaml-reader.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="include"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -109,6 +110,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="include"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -162,42 +164,42 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\main.cpp"
+				RelativePath=".\src\main.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\tests.cpp"
+				RelativePath=".\src\tests.cpp"
 				>
 			</File>
 			<Filter
 				Name="Scanner"
 				>
 				<File
-					RelativePath=".\exp.cpp"
+					RelativePath=".\src\exp.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\regex.cpp"
+					RelativePath=".\src\regex.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\scanner.cpp"
+					RelativePath=".\src\scanner.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\scanscalar.cpp"
+					RelativePath=".\src\scanscalar.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\scantoken.cpp"
+					RelativePath=".\src\scantoken.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\simplekey.cpp"
+					RelativePath=".\src\simplekey.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\stream.cpp"
+					RelativePath=".\src\stream.cpp"
 					>
 				</File>
 			</Filter>
@@ -205,11 +207,11 @@
 				Name="Parser"
 				>
 				<File
-					RelativePath=".\parser.cpp"
+					RelativePath=".\src\parser.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\parserstate.cpp"
+					RelativePath=".\src\parserstate.cpp"
 					>
 				</File>
 			</Filter>
@@ -217,27 +219,27 @@
 				Name="Representation"
 				>
 				<File
-					RelativePath=".\content.cpp"
+					RelativePath=".\src\content.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\iterator.cpp"
+					RelativePath=".\src\iterator.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\map.cpp"
+					RelativePath=".\src\map.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\node.cpp"
+					RelativePath=".\src\node.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\scalar.cpp"
+					RelativePath=".\src\scalar.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\sequence.cpp"
+					RelativePath=".\src\sequence.cpp"
 					>
 				</File>
 			</Filter>
@@ -248,38 +250,38 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\exceptions.h"
+				RelativePath=".\include\exceptions.h"
 				>
 			</File>
 			<File
-				RelativePath=".\tests.h"
+				RelativePath=".\src\tests.h"
 				>
 			</File>
 			<Filter
 				Name="Scanner"
 				>
 				<File
-					RelativePath=".\exp.h"
+					RelativePath=".\src\exp.h"
 					>
 				</File>
 				<File
-					RelativePath=".\regex.h"
+					RelativePath=".\src\regex.h"
 					>
 				</File>
 				<File
-					RelativePath=".\scanner.h"
+					RelativePath=".\src\scanner.h"
 					>
 				</File>
 				<File
-					RelativePath=".\scanscalar.h"
+					RelativePath=".\src\scanscalar.h"
 					>
 				</File>
 				<File
-					RelativePath=".\stream.h"
+					RelativePath=".\src\stream.h"
 					>
 				</File>
 				<File
-					RelativePath=".\token.h"
+					RelativePath=".\src\token.h"
 					>
 				</File>
 			</Filter>
@@ -287,11 +289,11 @@
 				Name="Parser"
 				>
 				<File
-					RelativePath=".\parser.h"
+					RelativePath=".\include\parser.h"
 					>
 				</File>
 				<File
-					RelativePath=".\parserstate.h"
+					RelativePath=".\include\parserstate.h"
 					>
 				</File>
 			</Filter>
@@ -299,27 +301,27 @@
 				Name="Representation"
 				>
 				<File
-					RelativePath=".\content.h"
+					RelativePath=".\src\content.h"
 					>
 				</File>
 				<File
-					RelativePath=".\ltnode.h"
+					RelativePath=".\include\ltnode.h"
 					>
 				</File>
 				<File
-					RelativePath=".\map.h"
+					RelativePath=".\src\map.h"
 					>
 				</File>
 				<File
-					RelativePath=".\node.h"
+					RelativePath=".\include\node.h"
 					>
 				</File>
 				<File
-					RelativePath=".\scalar.h"
+					RelativePath=".\src\scalar.h"
 					>
 				</File>
 				<File
-					RelativePath=".\sequence.h"
+					RelativePath=".\src\sequence.h"
 					>
 				</File>
 			</Filter>