added subfolders
eliminated test data and dynamcially added real data
Merge pull request #16 from JasonBenn/folders

added subfolders