revised file structure to match AWS requirements