reorganizing to work with AWS
minor