Remove index file
Move items around, comment correctly