#HE-2 some code structure fixes(header, subheader)
Merge pull request #21 from alexzaporozhets/#HE-2

#HE-2 some code structure fixes(header, subheader), removed old templates