namcos2 and namcos21: moved most remaining functions into classes (nw).