changed some dependecies and their locations