More DIRECTORY_SEPARTOR
Implemented correction of issue with template inheritance on component
templates