moved 3rd party stuff into a more sensible structure