Change name package.html to index.html
Added some new positions in index
Added some index fixes
Resolve conflicts
Final changes