Organize dir structure
Merge pull request #2 from ianks/dir

Organize dir structure