Server Organization Issues

I find the new way of arranging servers annoying to use. Half the time it will open the server instead of clicking and dragging it. Also, putting servers in folders is annoying to do. Overall I would prefer to used the old, more simple, way over this new way.