Moved routing into components