RM: project refactoring