move index sources into objects