Refactored packages, added parser class
Merge remote-tracking branch 'origin/master'