Updated wrt files to self register

Jira: WP-1308
Remove global variables
Merge pull request #4 from andreasbotsikas/WP-1308

Updated wrt files to self register