bug 3 Rearrange file structure to standard Gradle. Justin & Nicole