Move state/api and state/apiserver to top level

This is a follow up to #653 that finishes the general code migration.
gofmt
Merge pull request #655 from davecheney/191-move-state-api-apiserver-to-top-level

Move state/api and state/apiserver to top level

This is a follow up to #653 that finishes the general code migration.