Slight cleanup to models file.
Moved routing stuff.