Added aws cli. CLeaned up directory structure.