Move from index to separate route file