Refactor routes organization to allow for raw regex route formats