Moving properties to their own module.