Replacing sub-components with Titan.
Merge branch 'titan'