Fix initial directories creation