Refactor more. Move package validation/processing into package class