Moving files around to make a more general library.