Move some classes to new packages