Merged 'objects' and 'modules' into 'components'