got modules/classes straighted out