Convert Library to simple modules