refactored services and collecting fund to have different classes