completed directory restructuring