Restructure

Part 1 of restructure
Restructure

Part 2 - Moved model files and ported some production changes