correct filename and restructure directories for s3p