The current tools folder is a mess. I agree that some restructuring wouldn't hurt.