Cleaned up Libraries, Consolodated Folder Structure.