Migration to a more structured directory tree