major module reorganization