start of a refactoring the action routing

This is neither complete nor working, yet