WIP

- Simplified routes handling
- Added middleware hooks
- Added tests