Fix to use new directory layout
Remove extraneous line