The ID classes are now common to both. The files have been renamed to better illustrate their purpose.