Changes models to a more sensible layout