Added all new files for SmartWatch support