Merge pull request #10 from stulees/master

Revise directive, folder reorganization, gulp update