Refactored model classes, added apache io library