move server data to app & refactoring