Merge pull request #1 from fantasticfears/master

dir structure