restructured all the data. starting to rebuild parts of the app accordingly.