Changed library setup (and removed 3D version)