Merge components and common directories