refact all projects according to the ADT22