Reorganized files
Works with tconroy's Data Generator