Hi,

I think that this patch does a lot more than "Fix fhs directories".

Could you split it into multiple patches, each with a high-level subject that
allows the reviewer to find out the reason for it?