Second part of canlib refactoring. New versions.