New folder structures
Merge pull request #2 from jimmiebergmann/structure

New folder structures