Refactored Property and PropertyList into model package