Restructured lib