Change: Indexes generated directly in corresponding folder