Fixed the schema, testing scripts, and moved flat files to make the
directories more clean