Fixed attribution and package dir