updating libraries and re-organizing folder structure