Rearrange files for gradle build