Migrate to new directory structure