Remaster all

Change-Id: I47f70866e7306b614925412dfb71f10644630a1c
Small adjustments

Change-Id: I8908ba5d4f2dfb02500a02eb6e5590da267e1756
More reworking

Change-Id: Ibe5839f6432750909ac265953428f421d11eedad
It was right place

Change-Id: I47cd7c23326a7b86e955733d8b08b5cf4af88974