restructured project for android
restructured project part 2