Complete overhaul of dir structure