Lib folder includes cleanup