Refactored Project Hierarchy to be more Gradle Friendly.
Merge pull request #34 from cauchymop/tout_peter_encore

Refactored Project Hierarchy to be more Gradle Friendly.