Implement separated OAuth2 and data servers

Also includes bugfix for multiple tokens passed in a single request