Moves client and mock to client directory