Organize folder structure
Merge pull request #1 from ianks/organize-folder

Organize folder structure