Restore previous project structure so that other build scripts work smoothly.
Merge branch 'gradle' into retain-instance