more cleanup
move wm folder