Refactor structure and degeneralize templating structure
Delete old templating structure