Restructuring and added initial index template