reorg so autoload works