move TODO to the corresponding file