Moved library files around a bit.