Update project structure for gradle build system
update project structure