Refactoring, simpler package structure.