complete refactoring, module => bundle (WIP)