Removed the itemTreeModel and use TreeModel
Fixed ItemTree
Smaller refactoring