Move some classes from the 'health' version of this project with oauth, as a start at consolidating them