New folder structure
Merge pull request #34 from djhvscf/master

New folder structure