Reorganized indenter parts in their own packages. (for real this time)