Tidy things up; create a "lib" dir