restructuring dirs