Associate classes/modules when they already exist.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>