Fixed for new directory layout
13 files changed