Restructure for prior dev environment. Gradle snapshot is no good for 1.6.4.