Moved aws things into amazon folder