Extra restructuring of indexes & resources