Refactor and move tk part into a separate controller
Merge pull request #162 from zapion/v2.0

Refactor and move tk part into a separate controller