Fixed folder creation