Simplifying project layout.
Models complete, starting on questions