Reorganize activity routes/templates