Change back to using lib project