Cleaned up directory structure.

Setup the client to authenticate on an expired token.