Refactaring project