Adding up some downloaded lib code. Cleaning up path additions etc.