PSR-0
Better naming and better config