try #2 to make the dir structure more sensible