Package organization, mockfilereader, patchhandler eTag