Refactor Routes/Controllers/Actions