First Cut at Passing Submission Tests

Passes local tests
Consolidate Folders

Add the data CSV files, move up from subfolder for simplicity