Moved Tree View to Template - Renamed some classes