Add external libraries to the repo. Also, monor nrenamings in the code