moving some more modules over to new umd pattern