Reorganized into separate package and tool