Convert to psr-4 classloading