Adding individual template and modules