Restructure and add top level index