Moved routing to YML, allow correct priorities between modules