Merge the manager class

Change the class so that it does not hold income, expenses and goals, but holds a budget with those elements in it.