Tracking new directory structure (see previous commit comment).