Moving classes into lib.