Restructured common library