Restructured libraries layout