Initial 2.x commit. Add support for nested variable indexes, layered filters and variable to variable if comparisons
Remove unused classes