Hi,

Pushed as c6fae8a300..ff1bb647b5 to master. 

I've unbundled some more packages which were quite simple are combing as
dependencies for others.

--
Oleg