Cleanup and change lib file names