Oops- adding lib/src files for real now!