removing location dependancy to separate library