#92: move things to legacy and Widgets