Update aws and organize gemfile