rename client app, refactor