msg refactoring before project split