Changed Portable definition, re-added new files