Dynamic suffix for libraries
Cleaning up code and merging