renamed state/ to data/
renaming some things