Reorganized data and setup "skeleton" data.