[SHRINKDESC-151] refactored common packages