@bantu @icewind1991 can you help double-checking these auto-loader changes ? (I'm not familiar with autoloader, so not sure if this could break something else)