Organizing router better