Moved tree declarations to more appropriate file