main and test refactorings, package cglib.