refactored OortPropertiesFile classes hierachy