WIP: restructure MGT data