Completed substance library
Rearranged structure