Reorganize tree to take in account Roassal and NB-related stuff