Reorganized module contents