Organising files, added aws