Refactored analysis package.