Adds Token controller, model and updates controlers to be more dry