Merge pull request #7 from hansode/reorganize-folder-structure

Reorganize folder structure