ticket:1 fix tab in makefile
ticket:1 relocate templates