moved properties to external files