Move the classes into lib.