References to old directory structure removed