Refactoring. Created separate packages for celex and tests. Underscore naming now used everywhere.