Rename packages, updated build gradle