PSR-0 --> PSR-4, split config into 2