Reorganised AWS IaaS code