Resolved build conflicts, pathing issues and general errors in State sub-files.