diff --git a/makerom/deps/libyaml/yaml.h b/makerom/deps/libyaml/include/libyaml/yaml.h
similarity index 100%
rename from makerom/deps/libyaml/yaml.h
rename to makerom/deps/libyaml/include/libyaml/yaml.h
diff --git a/makerom/deps/libyaml/makefile b/makerom/deps/libyaml/makefile
new file mode 100644
index 0000000..5769138
--- /dev/null
+++ b/makerom/deps/libyaml/makefile
@@ -0,0 +1,197 @@
+# C++/C Recursive Project Makefile 
+# (c) Jack
+# Version 6 (20211110)
+
+# Project Name
+PROJECT_NAME = libyaml
+
+# Project Relative Paths
+PROJECT_PATH = $(CURDIR)
+PROJECT_SRC_PATH = src
+PROJECT_SRC_SUBDIRS = $(PROJECT_SRC_PATH)
+PROJECT_INCLUDE_PATH = include
+#PROJECT_TESTSRC_PATH = test
+#PROJECT_TESTSRC_SUBDIRS = $(PROJECT_TESTSRC_PATH)
+PROJECT_BIN_PATH = bin
+#PROJECT_DOCS_PATH = docs
+#PROJECT_DOXYFILE_PATH = Doxyfile
+
+# Determine if the root makefile has been established, and if not establish this makefile as the root makefile
+ifeq ($(ROOT_PROJECT_NAME),)
+	export ROOT_PROJECT_NAME = $(PROJECT_NAME)
+	export ROOT_PROJECT_PATH = $(PROJECT_PATH)
+	export ROOT_PROJECT_DEPENDENCY_PATH = $(ROOT_PROJECT_PATH)/deps
+endif
+
+# Shared Library Definitions
+PROJECT_SO_VER_MAJOR = 0
+PROJECT_SO_VER_MINOR = 1
+PROJECT_SO_VER_PATCH = 0
+PROJECT_SONAME = $(PROJECT_NAME).so.$(PROJECT_SO_VER_MAJOR)
+PROJECT_SO_FILENAME = $(PROJECT_SONAME).$(PROJECT_SO_VER_MINOR).$(PROJECT_SO_VER_PATCH)
+
+# Project Dependencies
+PROJECT_DEPEND = 
+PROJECT_DEPEND_LOCAL_DIR = 
+
+# Generate compiler flags for including project include path
+ifneq ($(PROJECT_INCLUDE_PATH),)
+	INC += -I"$(PROJECT_INCLUDE_PATH)"
+endif
+
+# Generate compiler flags for local included dependencies
+ifneq ($(PROJECT_DEPEND_LOCAL_DIR),)
+	LIB += $(foreach dep,$(PROJECT_DEPEND_LOCAL_DIR), -L"$(ROOT_PROJECT_DEPENDENCY_PATH)/$(dep)/bin")
+	INC += $(foreach dep,$(PROJECT_DEPEND_LOCAL_DIR), -I"$(ROOT_PROJECT_DEPENDENCY_PATH)/$(dep)/include")
+endif
+
+# Generate compiler flags for external dependencies
+ifneq ($(PROJECT_DEPEND),)
+	LIB += $(foreach dep,$(PROJECT_DEPEND), -l$(dep))
+endif
+
+# Detect Platform
+ifeq ($(PROJECT_PLATFORM),)
+	ifeq ($(OS), Windows_NT)
+		export PROJECT_PLATFORM = WIN32
+	else
+		UNAME = $(shell uname -s)
+		ifeq ($(UNAME), Darwin)
+			export PROJECT_PLATFORM = MACOS
+		else
+			export PROJECT_PLATFORM = GNU
+		endif
+	endif
+endif
+
+# Detect Architecture
+ifeq ($(PROJECT_PLATFORM_ARCH),)
+	ifeq ($(PROJECT_PLATFORM), WIN32)
+		export PROJECT_PLATFORM_ARCH = x86_64
+	else ifeq ($(PROJECT_PLATFORM), GNU)
+		export PROJECT_PLATFORM_ARCH = $(shell uname -m)
+	else ifeq ($(PROJECT_PLATFORM), MACOS)
+		export PROJECT_PLATFORM_ARCH = $(shell uname -m)
+	else
+		export PROJECT_PLATFORM_ARCH = x86_64
+	endif
+endif
+
+# Generate platform specific compiler flags
+ifeq ($(PROJECT_PLATFORM), WIN32)
+	# Windows Flags/Libs
+	CC = x86_64-w64-mingw32-gcc
+	CXX = x86_64-w64-mingw32-g++
+	WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable
+	ARCHFLAGS =
+	INC +=
+	LIB += -static
+	ARFLAGS = cr -o
+else ifeq ($(PROJECT_PLATFORM), GNU)
+	# GNU/Linux Flags/Libs
+	#CC = 
+	#CXX =
+	WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable
+	ARCHFLAGS =
+	INC +=
+	LIB +=
+	ARFLAGS = cr -o
+else ifeq ($(PROJECT_PLATFORM), MACOS)
+	# MacOS Flags/Libs
+	#CC = 
+	#CXX =
+	WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-private-field
+	ARCHFLAGS = -arch $(PROJECT_PLATFORM_ARCH)
+	INC +=
+	LIB +=
+	ARFLAGS = rc	
+endif
+
+# Compiler Flags
+CXXFLAGS = -std=c++11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC
+CFLAGS = -std=c11 $(INC) $(WARNFLAGS) $(ARCHFLAGS) -fPIC
+
+# Object Files
+SRC_OBJ = $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cc,.o,$(wildcard $(dir)/*.cc))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c)))
+TESTSRC_OBJ = $(foreach dir,$(PROJECT_TESTSRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_TESTSRC_SUBDIRS),$(subst .cc,.o,$(wildcard $(dir)/*.cc))) $(foreach dir,$(PROJECT_TESTSRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c)))
+
+# all is the default, user should specify what the default should do
+#	- 'static_lib' for building static library
+#	- 'shared_lib' for building shared library
+#	- 'program' for building the program
+#	- 'test_program' for building the test program
+# These can typically be used together however *_lib and program should not be used together
+all: static_lib
+	
+clean: clean_object_files remove_binary_dir
+
+# Object Compile Rules
+%.o: %.c
+	@echo CC $<
+	@$(CC) $(CFLAGS) -c $< -o $@ 
+
+%.o: %.cpp
+	@echo CXX $<
+	@$(CXX) $(CXXFLAGS) -c $< -o $@ 
+
+%.o: %.cc
+	@echo CXX $<
+	@$(CXX) $(CXXFLAGS) -c $< -o $@ 
+
+# Binary Directory
+.PHONY: create_binary_dir
+create_binary_dir:
+	@mkdir -p "$(PROJECT_BIN_PATH)"
+
+.PHONY: remove_binary_dir
+remove_binary_dir:
+ifneq ($(PROJECT_BIN_PATH),)
+	@rm -rf "$(PROJECT_BIN_PATH)"
+endif
+
+.PHONY: clean_object_files
+clean_object_files:
+	@rm -f $(SRC_OBJ) $(TESTSRC_OBJ)
+
+# Build Library
+static_lib: $(SRC_OBJ) create_binary_dir
+	@echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_NAME).a
+	@ar $(ARFLAGS) "$(PROJECT_BIN_PATH)/$(PROJECT_NAME).a" $(SRC_OBJ)
+
+shared_lib: $(SRC_OBJ) create_binary_dir
+	@echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_SO_FILENAME)
+	@gcc -shared -Wl,-soname,$(PROJECT_SONAME) -o "$(PROJECT_BIN_PATH)/$(PROJECT_SO_FILENAME)" $(SRC_OBJ)
+
+# Build Program
+program: $(SRC_OBJ) create_binary_dir
+	@echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_NAME)
+	@$(CXX) $(ARCHFLAGS) $(SRC_OBJ) $(LIB) -o "$(PROJECT_BIN_PATH)/$(PROJECT_NAME)"
+
+# Build Test Program
+test_program: $(TESTSRC_OBJ) $(SRC_OBJ) create_binary_dir
+ifneq ($(PROJECT_TESTSRC_PATH),)
+	@echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_NAME)_test
+	@$(CXX) $(ARCHFLAGS) $(TESTSRC_OBJ) $(SRC_OBJ) $(LIB) -o "$(PROJECT_BIN_PATH)/$(PROJECT_NAME)_test"
+endif
+
+# Documentation
+.PHONY: docs
+docs:
+ifneq ($(PROJECT_DOCS_PATH),)
+	doxygen "$(PROJECT_DOXYFILE_PATH)"
+endif
+
+.PHONY: clean_docs
+clean_docs:
+ifneq ($(PROJECT_DOCS_PATH),)
+	@rm -rf "$(PROJECT_DOCS_PATH)"
+endif
+
+# Dependencies
+.PHONY: deps
+deps:
+	@$(foreach lib,$(PROJECT_DEPEND_LOCAL_DIR), cd "$(ROOT_PROJECT_DEPENDENCY_PATH)/$(lib)" && $(MAKE) static_lib && cd "$(PROJECT_PATH)";)
+
+.PHONY: clean_deps
+clean_deps:
+	@$(foreach lib,$(PROJECT_DEPEND_LOCAL_DIR), cd "$(ROOT_PROJECT_DEPENDENCY_PATH)/$(lib)" && $(MAKE) clean && cd "$(PROJECT_PATH)";)
\ No newline at end of file
diff --git a/makerom/deps/libyaml/api.c b/makerom/deps/libyaml/src/api.c
similarity index 99%
rename from makerom/deps/libyaml/api.c
rename to makerom/deps/libyaml/src/api.c
index d2c13d3..2f3c142 100644
--- a/makerom/deps/libyaml/api.c
+++ b/makerom/deps/libyaml/src/api.c
@@ -1,4 +1,4 @@
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * Get the library titleVersion.
diff --git a/makerom/deps/libyaml/dumper.c b/makerom/deps/libyaml/src/dumper.c
similarity index 99%
rename from makerom/deps/libyaml/dumper.c
rename to makerom/deps/libyaml/src/dumper.c
index 4f89ab1..6c2ae6c 100644
--- a/makerom/deps/libyaml/dumper.c
+++ b/makerom/deps/libyaml/src/dumper.c
@@ -1,5 +1,5 @@
 
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * API functions.
diff --git a/makerom/deps/libyaml/emitter.c b/makerom/deps/libyaml/src/emitter.c
similarity index 99%
rename from makerom/deps/libyaml/emitter.c
rename to makerom/deps/libyaml/src/emitter.c
index 5beab1f..3539d3b 100644
--- a/makerom/deps/libyaml/emitter.c
+++ b/makerom/deps/libyaml/src/emitter.c
@@ -1,5 +1,5 @@
 
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * Flush the buffer if needed.
diff --git a/makerom/deps/libyaml/loader.c b/makerom/deps/libyaml/src/loader.c
similarity index 99%
rename from makerom/deps/libyaml/loader.c
rename to makerom/deps/libyaml/src/loader.c
index b3bdf25..321155e 100644
--- a/makerom/deps/libyaml/loader.c
+++ b/makerom/deps/libyaml/src/loader.c
@@ -1,5 +1,5 @@
 
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * API functions.
diff --git a/makerom/deps/libyaml/parser.c b/makerom/deps/libyaml/src/parser.c
similarity index 99%
rename from makerom/deps/libyaml/parser.c
rename to makerom/deps/libyaml/src/parser.c
index 0649d85..8f44086 100644
--- a/makerom/deps/libyaml/parser.c
+++ b/makerom/deps/libyaml/src/parser.c
@@ -39,7 +39,7 @@
  * flow_mapping_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
  */
 
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * Peek the next token in the token queue.
diff --git a/makerom/deps/libyaml/reader.c b/makerom/deps/libyaml/src/reader.c
similarity index 99%
rename from makerom/deps/libyaml/reader.c
rename to makerom/deps/libyaml/src/reader.c
index e7ab27a..829e32d 100644
--- a/makerom/deps/libyaml/reader.c
+++ b/makerom/deps/libyaml/src/reader.c
@@ -1,5 +1,5 @@
 
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * Declarations.
diff --git a/makerom/deps/libyaml/scanner.c b/makerom/deps/libyaml/src/scanner.c
similarity index 99%
rename from makerom/deps/libyaml/scanner.c
rename to makerom/deps/libyaml/src/scanner.c
index 0ed7c7b..6ddf018 100644
--- a/makerom/deps/libyaml/scanner.c
+++ b/makerom/deps/libyaml/src/scanner.c
@@ -475,7 +475,7 @@
  *      BLOCK-END
  */
 
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * Ensure that the buffer contains the required number of characters.
diff --git a/makerom/deps/libyaml/writer.c b/makerom/deps/libyaml/src/writer.c
similarity index 99%
rename from makerom/deps/libyaml/writer.c
rename to makerom/deps/libyaml/src/writer.c
index 7fc4754..b90019f 100644
--- a/makerom/deps/libyaml/writer.c
+++ b/makerom/deps/libyaml/src/writer.c
@@ -1,5 +1,5 @@
 
-#include "libyaml/yaml_private.h"
+#include "yaml_private.h"
 
 /*
  * Declarations.
diff --git a/makerom/deps/libyaml/yaml_private.h b/makerom/deps/libyaml/src/yaml_private.h
similarity index 99%
rename from makerom/deps/libyaml/yaml_private.h
rename to makerom/deps/libyaml/src/yaml_private.h
index 92bf799..c9d5616 100644
--- a/makerom/deps/libyaml/yaml_private.h
+++ b/makerom/deps/libyaml/src/yaml_private.h
@@ -3,7 +3,7 @@
 #include <config.h>
 #endif
 
-#include "libyaml/yaml.h"
+#include <libyaml/yaml.h>
 
 #include <assert.h>
 #include <limits.h>