move ec2 stuff to aws/, cleanups