Made the libraries clearer
largely structural changes with some new data as well