more psr2 fixes, src dir is now 100% PSR compliant