Reorganizing

Updating index file with new organization system