Moved main page to code page
Moving stuff around
Merge branch 'update'