Extracted almost the whole lib into a PCL, added dependency on PCL storage.