Changing to Gradle

And some sorting