Reorganized structure; fixed case objects; made properties common