android: reorganize folder structure