Moving class to dp package