Refactor. Reorganize packages.