Refactor slick package