Moving CLI and AWS into respective subdirectories with the intention of sharing common AWS logic