* change project structure
* fix variable template inclusion