main class renamed, relationships added, class properties fixed