adjust spacing for helpers
rename tools back to components
adjust imports for names