added two other modules to base package