More tools and reorganization!