Organize deps a little
Merge pull request #30 from luvit/move-deps

Organize deps a little