refactoring - splitting up html files
finishing split-up of templates