Reorganized indenter parts in their own packages.