Updated library layout, not done yet though