Fix the dir structure