Moved name, changed and expanded scope of library