layout reorg for autoload