Refactoring: extract common code
Test for KT-365 Support renaming packages

 #KT-365 Obsolete
Buildserver auto merge