Files reorganized for gradle build