Reorganized file structures
Merge branch 'master' of https://github.com/moloch--/untwister into moloch
Merged with upstream master
Merge branch 'master' of https://github.com/moloch--/untwister into moloch