Libraries re-formatted