Made lib classes into modules