Fix some directory layout issues