Improve storage path, generate unique file names