Restructured for libs