Moved to gradle build system