refactored router and presenters