directory structure corrected and schema and data generation scripts included.