Refactor our project