moved to psr-4, closed some extension points