Renamed and re-organized field and state libraries and tests.