Refactor ec2 server running servers.