- added package name to hierarchy
- made sure hierarchy was appended correctly in recursion
- fixed Test.py to test single files, and to produce total result