Reorganised HTML includes to be in new 'views' directory; made some naming more consistent