Moved to gradle build structure