Refactored packages
Added ViewQuery annotation plus some sane logging defaults