Revert "Revert "Revert "Autoloader layout change"""

This reverts commit 8998edf09f6fa85ddddc9fcf14079045c4512e19.