Changed DataParser.py to have structure described in issue #16 for variables.