Rearranged Class Libraries and refferences