Feature/8802

Updated exports/requires of libraries