Moving lib out of source