Updated library layout