Restructured folders to fit original gradle structure
Merge pull request #163 from nhaarman/feature_restructure

Restructured folders to fit original gradle structure