more directory restructuring