Moved categories to trees, fixed category to project merge