Moved deprecated folders and changed config for zwave