Updated module structures and added Income Graphs.