restructuring - using index file