Fix file names and directories for aws