Oops, fix structure for psr-4