Tidy up files into lib folder