Minor, use another constructor of ClassId
Move ClassId to module descriptors, closer to other names
Buildserver auto merge