Restructure to match the model config
WIP