Resort lib files, adjust paths