Move things around for psr-0 compliance.