Cleanup the Current Model Format

[andrewbwm]

Some of the old conventions from the old format that was used with securiCAD are still present. We should remove them to keep the format clearer.