Refactor

Refactor changing app name and packages