Move client into client folder