Fix #225 - Refactored routes alternate structure