Old lib folder structure cleanup