update the project to new structure in Android