Decoupling modules & features AND moving game_nid function