Refactor and add ExpenseCategories module