#654 Refactoring.
#654 Refactoring.

CelineBoudier/rapid-router,CelineBoudier/rapid-router,CelineBoudier/rapid-router,CelineBoudier/rapid-router,mikebryant/rapid-router,mikebryant/rapid-router,mikebryant/rapid-router,mikebryant/rapid-router