New library layout