d66ed6fe35
* Move stray command structs to model package like the rest * Fix broken references
* Move stray command structs to model package like the rest * Fix broken references