restructure usdm dir