organizing the index code
Merge pull request #12 from Chaasof/master

organizing the index code