changed Library structure