improved PSR-0 mapping
unified XML indentation