Merge pull request #3 from stulees/master

Revise gulp process and folder structuring