Refactor package source