Use component method factory
Rename module to bundle