refactoring some modules, and deleting data relating to phonecat app.