Move package dir creation to new pp file