Add model specs and refactor Project