new project and refactoring code