Reorganize some code.

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	src/Orchestra/Extension/RouteGenerator.php
Merge branch '2.0'