Refactored: Models project renamed to Domain + fixes