Fixing puppet files copy order and file paths