start to refactoring on multiple project support