further re org of dir structure