[RCD] Roundcube Framework files location

We use Framework already in two external programs. I put files under lib/Roundcube there and modified autoloader

$filename = preg_replace(
    array(
        '/Mail_(.+)/',
        '/Net_(.+)/',
        '/Auth_(.+)/',
        '/^html_.+/',
        '/^rcube(.*)/',
        '/^utf8$/',
    ),
    array(
        'Mail/\\1',
        'Net/\\1',
        'Auth/\\1',
        'Roundcube/html',
        'Roundcube/rcube\\1',
        'utf8.class',
    ),
    $classname
);

So, now we're able to create a separate package with Roundcube Framework (with location in e.g. /usr/share/php/Roundcube) and not duplicate the code for every dependent project. What do you think about doing the same in Roundcube? If so, what should we do with clisetup.php, iniset.php, rcube_bc.inc and rcmail.php. Move them to program/lib/ (or program/) and get rid of program/include/ directory?