[NUCJAVAEIGHT-8] Refactor base package