Fully migrated to new directory structure.