moved files around for gradleization