Added koi and moth, moved Kaemura to moth.