Moved helper classes
Merge branch 'origin/MC1.6' of local repository into MC1.6