Fixed folder creation, removed unused properties