components merger - in progress
rename some name...