PSR-2 cleanup and PSR-0 structure