Model and Project Refactore