moved files around going on with PSR-0 adherernce