change the directory structure to look like other subprojects and fix build.gradle