Reified: refactoring of classes / files
Reified: refactored more + fixed typing of reified trees