Adding Makefiles and Schema Fixes