Project Refactor complete