restructure for new gradle build file