Move some class instancaiations outside the router