Serious reorganization of dir structure