move and delete
add new template path
correct templates, add template defs
add define for index
delete not used anymore
correct directory
add todo
Merge branch 'clean'