Use more resilient PSR-0 structure. Plus only version in one place.