Makes sense - glad I understood correctly.
May make sense to put an entry in the ChangeLog about some files moving down into state/, though.