Moved ec2 into it's own plugin package.