Once we have authenticated, we don't need a tagged authenticator any more.
Move the file to match the source.
Updates following review.
Merge pull request #354 from howbazaar/apiserver-entity-not-authenticator

Once we have authenticated, we don't need a tagged authenticator any more

state.Entity is fine.