Updating file locations to support the new architecture approach.
Merge origin/1.0 into 1.0

Conflicts:
	core/services/_config.php
	core/services/_http.php