master: new architecture
master: delete unsed template