Removed .bar duplicates and made stand-alone component