Task: refactor package