Remove barrel file imports from internal code for better tree-shaking

Remove barrel file imports from internal code for better tree-shaking #969