Module rename and reorganization