moved more tools out of core package to tools