Re-arranged the client controller perspective.