"index" is now "Index"
Cleanup and basic diff. WIP