Almost added expenditure + proxy classes moved to own folder