Fix directory layout