Migration to the new dir structure