reorganzized files for gradle