reorganize modules
Add module
fix to use new module