Including source and pkg separation