Correcting directory structure