moved around some libraries