Make separate package for command tool