New Gradle structure. Pulled branch into IntelliJ Ultimate edition. Cleaning up package names, etc.