Standardize Namespacing Conventions - Part 2

## Standardize Namespacing Conventions - Part 2

### Acceptance Criteria
1. OAuth2 services follow new namespacing conventions from #26.
1. Services in `User\Token` namespace are moved out to `User` namespace.

### Tasks
- None

### Additional Notes
- None