module directory restructuring