Further package refactoring.
Moved zcl packages.
Moved ha packages.
Refactoring.
Refactoring.
Refactoring.
Refactoring.