[refractoring] removed the lang namespace