Moving files around to work with PSR-0