Reorganize into 2 modules