Re-organize tools to appropriate dirs