Move classes to proper packages (mostly in xmas module).