refactoring COSMOS*-VP project