began renaming package to match android conventions