Reorganised the dependency management for custom components spec.