Rearranged library files