Tools directory reorganization