Moved the State constructor to a separate file