Refactor state and fix paths
Merge branch 'master' of github.com:lisa-groundhog/GroundHog