Routing improvements
Organize helpers
Redump 0.9.0