Added aws framework, refatored classes