complete reorg.... again
deleted unused templates