Tidied and modulorized all Property Classes