Refactored fees to its own package