Re-organized module