improve package setup