jwr: major overhaul of org structure