Refactor Routing

+ Englishing
- Bugs

Signed-off-by: Ramón Ramos <arathael@gmail.com>