Revert "Autoloader layout change"

This reverts commit bf67bd75d725aa75316edf198944c30ff2790fd7.
Revert "Revert "Autoloader layout change""

This reverts commit 6fba1439075d7e2546e3855f567ea0a6a816ec8e.