Properly handle folder creation