Organize code and naming conventions according to the diagram that we developed today