moving some things around and adding aws cli completion
Small changes