Adapt to new root directory structure, take 2