Dbouianov/aws sdk

Reorganizing test scripts.