changed folder structure for android app