Refactored Project Hierarchy to be more Gradle Friendly.