Modifications for new com_config

Hi,
After new com_config added to repo, I came across some design issues related to that. They are related to higher level such as class dependencies, class names etc. 
Thank You!