New build + move some classes to other package