Add helper class
Move package