refactoring towards new project