Added more tools, reorganization