Reorganize and add Gradle