Just the id_ did give no clue to the contents, just took care of the uniqueness. Better for debugging
Was getting confused myself, where it was instruction or instructions, when if the base class was inside or out of dir. Now dirs are plural, and base class is inside.
also some cleaning, by using more helpers