Converted to use Component
Shell project