Log removal and package refactoring.