Feature/aws directory prefix