Moving to PSR0 and PSR3 support