Reorganized token directory, started creating user factories/repositories, added some tests, and fixed some comments
Got user repos sort of working, miscellaneous fixes