Reorganize package structure
Update Gradle build script