restructure the lib folder