0025039: Improvement of code structure of general and supporting tools implemented...