Bundle up
Fix bug: wrong module structure