Added metrics and fixed what gets included in the lib dir