add components
fix path
remove subfolder
add helpers
Merge branch 'release/4.0.4'

Conflicts:
	CHANGELOG.md