moved libraries around to simplify dependancies