moved around dependancies and 3rd party, added some dependancies