attempt to make PSR-4 namespace organization work
partial fix for deprecated header classes