Moved 3rd party code to external libraries