Unflatten edk includes

Installing the edk headers into a folder requires us to do odd things
with imports, and either include headers with "..", or otherwise get the
include directories lined up.

Move the contents of edk/*.c/h up a level, and just simplify the include
structure.  This is done to fix the immediate change of the prior patch
and make this build again.  Happy to discuss other options.

Change-Id: I328f20bca6d23100993493445bee0e5e11d2866a
Signed-off-by: Ed Tanous <etanous@nvidia.com>
diff --git a/json-schema.c b/json-schema.c
index 949739e..dbbffbc 100644
--- a/json-schema.c
+++ b/json-schema.c
@@ -13,7 +13,7 @@
 #include <stdarg.h>
 #include <json.h>
 #include "json-schema.h"
-#include "edk/BaseTypes.h"
+#include "BaseTypes.h"
 
 //Field definitions.
 int json_validator_debug = 0;