Add safety for cases where the extension is loaded^
Switch to psr-4 autoloading