[#8][#9][#10] Directories done right