Setup reorganized data (not used in app yet)