Added support for new boilerplate structue, includes and HTML files