Complementary to previous checkin

I had to do a 'git add -i' to commit structural changes.