New project and refactorin