Fix crash from incorrect refactoring.
Move data into /data and /derived folders.