legacy: move to new structure

Addresses #2210