Moved compatibility module to a subpackage