Moved several classes to new package