Fix directory structure as per psr-0