Moving to data organization version of the app