cleaned up data structure code
organize imports
Merge branch 'master' of github.com:peq/WurstScript