Import, licence header and Gradle config cleanup