Converted to listeners instead of direct component binding.  Also refactored paths to enable application level testing.