refactor blaze components for new package structure