Library structure updated
Merged