refactor and rename of folders for publishing to google play store