Moved templates and static in discipline_terra