Merge "Change tethering file structure to respect its package name"