Automate model restructure

Initial model restructure.