Renaming, added lib
Renamed some things, added to lib