Move mkdir to save()