Reformat Library
Adding events manager