Integrate 'Property' data type into main library. Huge module reorganization. #24