Started rewriting loaders to use ZIP or dirs