Added router class and some general config