Moved the server components