Moving PC libraries so code is the same across PC and OSX
More moving