Creating a class diagram
Naming cleanup
Rename files and more members
Change util to ORM