Move some internal DI for better improvement.

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

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'

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

Conflicts:
	composer.json
	src/Orchestra/Extension/RouteGenerator.php