Revert "Cloning the oAuth server in"

This reverts commit bd1a558d523aaf953a4d0cb31b26df85ac92835b.
Including the oAuth server, but the master branch this time