Hmm. I'm inclined to kill this directory structure and go full-on Gradle/Maven structure (here and the sample). If you want, you can include that in this pull. Otherwise I'll make the change.