consolidate component definition
adjust include
move model class
Add support for @Source to specify property values