Making dir tree only 2 main levels and one optional 21-01-2014