S3 storage driver for next gen modifications

This still needs some more minor debugging.
This line cannot be reached if the move fails.