Reorganized module for proper imports.