Break up into some common libraries