Restructured some code, started stubbing out OAuth for Volos.