Moved the Library out to an external Plugin