Change index file

Some structure changes implemented