Moving forked repo into main SmartThings repo