Overhauling models

Relationships were getting recursive, due to models being split across multiple files
Fixing ID
Adjustments to token signup process