* Split header, add common header * Transform to canonical namespace * Deprecate old header * Adapt to new Tools.h