Refactor directory structure
Fix target path of client app