Fix directory strucutre