a little bit of renaming and fixing of structure.  Also added the ability to timeout a flowif your device doesn't support it