Moved files and updated html accordingly
Merge remote-tracking branch 'origin/master'