Removed expenses and incomes from Fairy
Removed unused components and restructured a bit