Changed package structure with psr-4