Yet more install fixes.
Install happens in sub directories now.