Refactored routing, added better facades, aliasing and such