Update to gradle 1.9
Move to flat project structure, redo gradle files.