Restructure the repo for gradle build