Adding keystore.
Renaming packages.