fix ability to route to static methods
fewer classes
renames