No more librarian
A 3-file approach.
Add components