Moved methods around.
Moved more methods around. Changed routes.