Refactored trik generator for new architecture
Made it compilling & working