Restructured ns.
Fixed join-classes call.